diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/ni52.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (diff) |
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer.
wireless, wimax, ixgbe, etc are not modified.
Compile tested x86 allyesconfig only
Not all files compiled (not x86 compatible)
Added a few > 80 column lines, which I ignored.
Existing checkpatch complaints ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ni52.c')
-rw-r--r-- | drivers/net/ni52.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index 305f4ba36999..b42f5e522f90 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
@@ -477,8 +477,8 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr) | |||
477 | for (i = 0; i < ETH_ALEN; i++) | 477 | for (i = 0; i < ETH_ALEN; i++) |
478 | dev->dev_addr[i] = inb(dev->base_addr+i); | 478 | dev->dev_addr[i] = inb(dev->base_addr+i); |
479 | 479 | ||
480 | if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 | 480 | if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 || |
481 | || dev->dev_addr[2] != NI52_ADDR2) { | 481 | dev->dev_addr[2] != NI52_ADDR2) { |
482 | retval = -ENODEV; | 482 | retval = -ENODEV; |
483 | goto out; | 483 | goto out; |
484 | } | 484 | } |