diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/s390/net/claw.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/s390/net/claw.c')
| -rw-r--r-- | drivers/s390/net/claw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c index 23d53bf9daf1..95f4e105cb96 100644 --- a/drivers/s390/net/claw.c +++ b/drivers/s390/net/claw.c | |||
| @@ -529,7 +529,7 @@ claw_open(struct net_device *dev) | |||
| 529 | printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); | 529 | printk(KERN_INFO "%s:%s Enter \n",dev->name,__FUNCTION__); |
| 530 | #endif | 530 | #endif |
| 531 | CLAW_DBF_TEXT(4,trace,"open"); | 531 | CLAW_DBF_TEXT(4,trace,"open"); |
| 532 | if (!dev | (dev->name[0] == 0x00)) { | 532 | if (!dev || (dev->name[0] == 0x00)) { |
| 533 | CLAW_DBF_TEXT(2,trace,"BadDev"); | 533 | CLAW_DBF_TEXT(2,trace,"BadDev"); |
| 534 | printk(KERN_WARNING "claw: Bad device at open failing \n"); | 534 | printk(KERN_WARNING "claw: Bad device at open failing \n"); |
| 535 | return -ENODEV; | 535 | return -ENODEV; |