diff options
-rw-r--r-- | drivers/net/pcmcia/pcnet_cs.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 181b6ed55003..f3ea4a9f2bf1 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
@@ -1155,11 +1155,13 @@ static int set_config(struct net_device *dev, struct ifmap *map) | |||
1155 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs) | 1155 | static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs) |
1156 | { | 1156 | { |
1157 | struct net_device *dev = dev_id; | 1157 | struct net_device *dev = dev_id; |
1158 | pcnet_dev_t *info = PRIV(dev); | 1158 | pcnet_dev_t *info; |
1159 | irqreturn_t ret = ei_interrupt(irq, dev_id, regs); | 1159 | irqreturn_t ret = ei_interrupt(irq, dev_id, regs); |
1160 | 1160 | ||
1161 | if (ret == IRQ_HANDLED) | 1161 | if (ret == IRQ_HANDLED) { |
1162 | info = PRIV(dev); | ||
1162 | info->stale = 0; | 1163 | info->stale = 0; |
1164 | } | ||
1163 | return ret; | 1165 | return ret; |
1164 | } | 1166 | } |
1165 | 1167 | ||
@@ -1350,7 +1352,7 @@ static void dma_block_input(struct net_device *dev, int count, | |||
1350 | if (count & 0x01) | 1352 | if (count & 0x01) |
1351 | buf[count-1] = inb(nic_base + PCNET_DATAPORT), xfer_count++; | 1353 | buf[count-1] = inb(nic_base + PCNET_DATAPORT), xfer_count++; |
1352 | 1354 | ||
1353 | /* This was for the ALPHA version only, but enough people have | 1355 | /* This was for the ALPHA version only, but enough people have been |
1354 | encountering problems that it is still here. */ | 1356 | encountering problems that it is still here. */ |
1355 | #ifdef PCMCIA_DEBUG | 1357 | #ifdef PCMCIA_DEBUG |
1356 | if (ei_debug > 4) { /* DMA termination address check... */ | 1358 | if (ei_debug > 4) { /* DMA termination address check... */ |
@@ -1424,7 +1426,7 @@ static void dma_block_output(struct net_device *dev, int count, | |||
1424 | dma_start = jiffies; | 1426 | dma_start = jiffies; |
1425 | 1427 | ||
1426 | #ifdef PCMCIA_DEBUG | 1428 | #ifdef PCMCIA_DEBUG |
1427 | /* This was for the ALPHA version only, but enough people have | 1429 | /* This was for the ALPHA version only, but enough people have been |
1428 | encountering problems that it is still here. */ | 1430 | encountering problems that it is still here. */ |
1429 | if (ei_debug > 4) { /* DMA termination address check... */ | 1431 | if (ei_debug > 4) { /* DMA termination address check... */ |
1430 | int addr, tries = 20; | 1432 | int addr, tries = 20; |