From: Dave Jones Whoops, better hope this never gets passed a null dev in its current state. Signed-off-by: Dave Jones Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Michael Holzheu Cc: Jeff Garzik Signed-off-by: Andrew Morton --- drivers/s390/net/claw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/s390/net/claw.c~s390-broken-null-test-in-claw-driver drivers/s390/net/claw.c --- a/drivers/s390/net/claw.c~s390-broken-null-test-in-claw-driver +++ a/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; _