aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/axnet_cs.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/pcmcia/axnet_cs.c
parent3454f835837609d60b29a266e3bd9d701073b060 (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/pcmcia/axnet_cs.c')
-rw-r--r--drivers/net/pcmcia/axnet_cs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 3131a59a8d32..ca711f46814e 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -1232,8 +1232,8 @@ static irqreturn_t ax_interrupt(int irq, void *dev_id)
1232 ei_local->irqlock = 1; 1232 ei_local->irqlock = 1;
1233 1233
1234 /* !!Assumption!! -- we stay in page 0. Don't break this. */ 1234 /* !!Assumption!! -- we stay in page 0. Don't break this. */
1235 while ((interrupts = inb_p(e8390_base + EN0_ISR)) != 0 1235 while ((interrupts = inb_p(e8390_base + EN0_ISR)) != 0 &&
1236 && ++nr_serviced < MAX_SERVICE) 1236 ++nr_serviced < MAX_SERVICE)
1237 { 1237 {
1238 if (!netif_running(dev) || (interrupts == 0xff)) { 1238 if (!netif_running(dev) || (interrupts == 0xff)) {
1239 if (ei_debug > 1) 1239 if (ei_debug > 1)