diff options
| -rw-r--r-- | drivers/net/ethernet/korina.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index cbeea915f026..8037426ec50f 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c | |||
| @@ -900,10 +900,10 @@ static void korina_restart_task(struct work_struct *work) | |||
| 900 | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR, | 900 | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR, |
| 901 | &lp->rx_dma_regs->dmasm); | 901 | &lp->rx_dma_regs->dmasm); |
| 902 | 902 | ||
| 903 | korina_free_ring(dev); | ||
| 904 | |||
| 905 | napi_disable(&lp->napi); | 903 | napi_disable(&lp->napi); |
| 906 | 904 | ||
| 905 | korina_free_ring(dev); | ||
| 906 | |||
| 907 | if (korina_init(dev) < 0) { | 907 | if (korina_init(dev) < 0) { |
| 908 | printk(KERN_ERR "%s: cannot restart device\n", dev->name); | 908 | printk(KERN_ERR "%s: cannot restart device\n", dev->name); |
| 909 | return; | 909 | return; |
| @@ -1064,12 +1064,12 @@ static int korina_close(struct net_device *dev) | |||
| 1064 | tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR; | 1064 | tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR; |
| 1065 | writel(tmp, &lp->rx_dma_regs->dmasm); | 1065 | writel(tmp, &lp->rx_dma_regs->dmasm); |
| 1066 | 1066 | ||
| 1067 | korina_free_ring(dev); | ||
| 1068 | |||
| 1069 | napi_disable(&lp->napi); | 1067 | napi_disable(&lp->napi); |
| 1070 | 1068 | ||
| 1071 | cancel_work_sync(&lp->restart_task); | 1069 | cancel_work_sync(&lp->restart_task); |
| 1072 | 1070 | ||
| 1071 | korina_free_ring(dev); | ||
| 1072 | |||
| 1073 | free_irq(lp->rx_irq, dev); | 1073 | free_irq(lp->rx_irq, dev); |
| 1074 | free_irq(lp->tx_irq, dev); | 1074 | free_irq(lp->tx_irq, dev); |
| 1075 | free_irq(lp->ovr_irq, dev); | 1075 | free_irq(lp->ovr_irq, dev); |
