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/hp-plus.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/hp-plus.c')
-rw-r--r-- | drivers/net/hp-plus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index 0486cbe01adb..efdbcad63c67 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c | |||
@@ -187,8 +187,8 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr) | |||
187 | return -EBUSY; | 187 | return -EBUSY; |
188 | 188 | ||
189 | /* Check for the HP+ signature, 50 48 0x 53. */ | 189 | /* Check for the HP+ signature, 50 48 0x 53. */ |
190 | if (inw(ioaddr + HP_ID) != 0x4850 | 190 | if (inw(ioaddr + HP_ID) != 0x4850 || |
191 | || (inw(ioaddr + HP_PAGING) & 0xfff0) != 0x5300) { | 191 | (inw(ioaddr + HP_PAGING) & 0xfff0) != 0x5300) { |
192 | retval = -ENODEV; | 192 | retval = -ENODEV; |
193 | goto out; | 193 | goto out; |
194 | } | 194 | } |