diff options
Diffstat (limited to 'drivers/net/znet.c')
| -rw-r--r-- | drivers/net/znet.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index a0384b6f09b6..b42347333750 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -169,7 +169,6 @@ static void znet_tx_timeout (struct net_device *dev); | |||
| 169 | static int znet_request_resources (struct net_device *dev) | 169 | static int znet_request_resources (struct net_device *dev) |
| 170 | { | 170 | { |
| 171 | struct znet_private *znet = netdev_priv(dev); | 171 | struct znet_private *znet = netdev_priv(dev); |
| 172 | unsigned long flags; | ||
| 173 | 172 | ||
| 174 | if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) | 173 | if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) |
| 175 | goto failed; | 174 | goto failed; |
| @@ -187,13 +186,9 @@ static int znet_request_resources (struct net_device *dev) | |||
| 187 | free_sia: | 186 | free_sia: |
| 188 | release_region (znet->sia_base, znet->sia_size); | 187 | release_region (znet->sia_base, znet->sia_size); |
| 189 | free_tx_dma: | 188 | free_tx_dma: |
| 190 | flags = claim_dma_lock(); | ||
| 191 | free_dma (znet->tx_dma); | 189 | free_dma (znet->tx_dma); |
| 192 | release_dma_lock (flags); | ||
| 193 | free_rx_dma: | 190 | free_rx_dma: |
| 194 | flags = claim_dma_lock(); | ||
| 195 | free_dma (znet->rx_dma); | 191 | free_dma (znet->rx_dma); |
| 196 | release_dma_lock (flags); | ||
| 197 | free_irq: | 192 | free_irq: |
| 198 | free_irq (dev->irq, dev); | 193 | free_irq (dev->irq, dev); |
| 199 | failed: | 194 | failed: |
| @@ -203,14 +198,11 @@ static int znet_request_resources (struct net_device *dev) | |||
| 203 | static void znet_release_resources (struct net_device *dev) | 198 | static void znet_release_resources (struct net_device *dev) |
| 204 | { | 199 | { |
| 205 | struct znet_private *znet = netdev_priv(dev); | 200 | struct znet_private *znet = netdev_priv(dev); |
| 206 | unsigned long flags; | ||
| 207 | 201 | ||
| 208 | release_region (znet->sia_base, znet->sia_size); | 202 | release_region (znet->sia_base, znet->sia_size); |
| 209 | release_region (dev->base_addr, znet->io_size); | 203 | release_region (dev->base_addr, znet->io_size); |
| 210 | flags = claim_dma_lock(); | ||
| 211 | free_dma (znet->tx_dma); | 204 | free_dma (znet->tx_dma); |
| 212 | free_dma (znet->rx_dma); | 205 | free_dma (znet->rx_dma); |
| 213 | release_dma_lock (flags); | ||
| 214 | free_irq (dev->irq, dev); | 206 | free_irq (dev->irq, dev); |
| 215 | } | 207 | } |
| 216 | 208 | ||
