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/isa-skeleton.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/isa-skeleton.c')
-rw-r--r-- | drivers/net/isa-skeleton.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c index 0e71e2a93160..04d0502726c0 100644 --- a/drivers/net/isa-skeleton.c +++ b/drivers/net/isa-skeleton.c | |||
@@ -214,9 +214,9 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr) | |||
214 | * contains the manufacturer's unique code. That might be a good probe | 214 | * contains the manufacturer's unique code. That might be a good probe |
215 | * method. Ideally you would add additional checks. | 215 | * method. Ideally you would add additional checks. |
216 | */ | 216 | */ |
217 | if (inb(ioaddr + 0) != SA_ADDR0 | 217 | if (inb(ioaddr + 0) != SA_ADDR0 || |
218 | || inb(ioaddr + 1) != SA_ADDR1 | 218 | inb(ioaddr + 1) != SA_ADDR1 || |
219 | || inb(ioaddr + 2) != SA_ADDR2) | 219 | inb(ioaddr + 2) != SA_ADDR2) |
220 | goto out; | 220 | goto out; |
221 | 221 | ||
222 | if (net_debug && version_printed++ == 0) | 222 | if (net_debug && version_printed++ == 0) |