aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-07-10 04:45:18 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 13:24:25 -0700
commit68e3c5e3b5c29ea76152dc1d1482826434d45019 (patch)
tree010388a2733b9209912f7540934736d5a859b0e3
parentf1c0a578ca960d10fce049765bb9e5a53fb53d2e (diff)
downloadkernel_samsung_tuna-68e3c5e3b5c29ea76152dc1d1482826434d45019.zip
kernel_samsung_tuna-68e3c5e3b5c29ea76152dc1d1482826434d45019.tar.gz
kernel_samsung_tuna-68e3c5e3b5c29ea76152dc1d1482826434d45019.tar.bz2
[PATCH] s390: broken null test in claw driver
Whoops, better hope this never gets passed a null dev in its current state. Signed-off-by: Dave Jones <davej@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Michael Holzheu <holzheu@de.ibm.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/s390/net/claw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 23d53bf..95f4e10 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -529,7 +529,7 @@ claw_open(struct net_device *dev)
printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__);
#endif
CLAW_DBF_TEXT(4,trace,"open");
- if (!dev | (dev->name[0] == 0x00)) {
+ if (!dev || (dev->name[0] == 0x00)) {
CLAW_DBF_TEXT(2,trace,"BadDev");
printk(KERN_WARNING "claw: Bad device at open failing \n");
return -ENODEV;