From 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 4 Feb 2000 07:40:19 +0000 Subject: Merge with Linux 2.3.32. --- drivers/net/hamradio/scc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/net/hamradio/scc.c') diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index a46cff85f..4de421874 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c @@ -1571,7 +1571,7 @@ static int scc_net_setup(struct scc_channel *scc, unsigned char *name, int addev unsigned char *buf; struct net_device *dev; - if (dev_get(name) != NULL) + if (dev_get(name)) { printk(KERN_INFO "Z8530drv: device %s already exists.\n", name); return -EEXIST; @@ -2068,7 +2068,7 @@ static struct net_device_stats *scc_net_get_stats(struct net_device *dev) /* ******************************************************************** */ -static int scc_net_get_info(char *buffer, char **start, off_t offset, int length, int dummy) +static int scc_net_get_info(char *buffer, char **start, off_t offset, int length) { struct scc_channel *scc; struct scc_kiss *kiss; -- cgit v1.2.3