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/mac89x0.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/mac89x0.c')
-rw-r--r-- | drivers/net/mac89x0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index c244ec34fc43..23b633e2ac42 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
@@ -222,8 +222,8 @@ struct net_device * __init mac89x0_probe(int unit) | |||
222 | int card_present; | 222 | int card_present; |
223 | 223 | ||
224 | local_irq_save(flags); | 224 | local_irq_save(flags); |
225 | card_present = hwreg_present((void*) ioaddr+4) | 225 | card_present = (hwreg_present((void*) ioaddr+4) && |
226 | && hwreg_present((void*) ioaddr + DATA_PORT); | 226 | hwreg_present((void*) ioaddr + DATA_PORT)); |
227 | local_irq_restore(flags); | 227 | local_irq_restore(flags); |
228 | 228 | ||
229 | if (!card_present) | 229 | if (!card_present) |