lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

znet: Don't claim DMA lock around free_dma() calls.

Browse Source 
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>
This commit is contained in:
David S. Miller
2009-10-07 22:15:23 -07:00
parent d308e38fa5
commit 879e930413
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/znet.c
View File

@@ -169,7 +169,6 @@ static void znet_tx_timeout (struct net_device *dev);
static int znet_request_resources (struct net_device *dev) static int znet_request_resources (struct net_device *dev)
{ {
struct znet_private *znet = netdev_priv(dev); struct znet_private *znet = netdev_priv(dev);
unsigned long flags;
if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev)) if (request_irq (dev->irq, &znet_interrupt, 0, "ZNet", dev))
goto failed; goto failed;
@@ -187,13 +186,9 @@ static int znet_request_resources (struct net_device *dev)
free_sia: free_sia:
release_region (znet->sia_base, znet->sia_size); release_region (znet->sia_base, znet->sia_size);
free_tx_dma: free_tx_dma:
flags = claim_dma_lock();
free_dma (znet->tx_dma); free_dma (znet->tx_dma);
release_dma_lock (flags);
free_rx_dma: free_rx_dma:
flags = claim_dma_lock();
free_dma (znet->rx_dma); free_dma (znet->rx_dma);
release_dma_lock (flags);
free_irq: free_irq:
free_irq (dev->irq, dev); free_irq (dev->irq, dev);
failed: failed:
@@ -203,14 +198,11 @@ static int znet_request_resources (struct net_device *dev)
static void znet_release_resources (struct net_device *dev) static void znet_release_resources (struct net_device *dev)
{ {
struct znet_private *znet = netdev_priv(dev); struct znet_private *znet = netdev_priv(dev);
unsigned long flags;
release_region (znet->sia_base, znet->sia_size); release_region (znet->sia_base, znet->sia_size);
release_region (dev->base_addr, znet->io_size); release_region (dev->base_addr, znet->io_size);
flags = claim_dma_lock();
free_dma (znet->tx_dma); free_dma (znet->tx_dma);
free_dma (znet->rx_dma); free_dma (znet->rx_dma);
release_dma_lock (flags);
free_irq (dev->irq, dev); free_irq (dev->irq, dev);
} }