diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-08 07:15:23 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-08 07:15:23 +0200 |
| commit | 879e9304134bb6214fb52377ac1e01e1910f4916 (patch) | |
| tree | f3ae00c87efaeba67a5143eae8555f08f8152902 /drivers/net/znet.c | |
| parent | include/linux/netdevice.h: fix nanodoc mismatch (diff) | |
| download | linux-879e9304134bb6214fb52377ac1e01e1910f4916.tar.xz linux-879e9304134bb6214fb52377ac1e01e1910f4916.zip | |
znet: Don't claim DMA lock around free_dma() calls.
It's not necessary and it's illegal too.
Reported-by: Alexander Strakh <strakh@ispras.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
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); static int znet_request_resources (struct net_device *dev) { struct znet_private *znet = netdev_priv(dev); - unsigned long flags; if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) goto failed; @@ -187,13 +186,9 @@ static int znet_request_resources (struct net_device *dev) free_sia: release_region (znet->sia_base, znet->sia_size); free_tx_dma: - flags = claim_dma_lock(); free_dma (znet->tx_dma); - release_dma_lock (flags); free_rx_dma: - flags = claim_dma_lock(); free_dma (znet->rx_dma); - release_dma_lock (flags); free_irq: free_irq (dev->irq, dev); failed: @@ -203,14 +198,11 @@ static int znet_request_resources (struct net_device *dev) static void znet_release_resources (struct net_device *dev) { struct znet_private *znet = netdev_priv(dev); - unsigned long flags; release_region (znet->sia_base, znet->sia_size); release_region (dev->base_addr, znet->io_size); - flags = claim_dma_lock(); free_dma (znet->tx_dma); free_dma (znet->rx_dma); - release_dma_lock (flags); free_irq (dev->irq, dev); } |