dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

r6040: Free irq line on error path 

Free irq line on error path.

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis Kirjanov 2010-08-24 23:57:55 +00:00 committed by David S. Miller
parent f0c54ace9b
commit ced1de4c9e
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/net/r6040.c
View File

@ -756,7 +756,7 @@ static int r6040_open(struct net_device *dev)
ret = request_irq(dev->irq, r6040_interrupt, ret = request_irq(dev->irq, r6040_interrupt,
IRQF_SHARED, dev->name, dev); IRQF_SHARED, dev->name, dev);
if (ret) if (ret)
return ret; goto out;
/* Set MAC address */ /* Set MAC address */
r6040_mac_address(dev); r6040_mac_address(dev);
@ -764,30 +764,37 @@ static int r6040_open(struct net_device *dev)
/* Allocate Descriptor memory */ /* Allocate Descriptor memory */
lp->rx_ring = lp->rx_ring =
pci_alloc_consistent(lp->pdev, RX_DESC_SIZE, &lp->rx_ring_dma); pci_alloc_consistent(lp->pdev, RX_DESC_SIZE, &lp->rx_ring_dma);
if (!lp->rx_ring) if (!lp->rx_ring) {
return -ENOMEM; ret = -ENOMEM;
goto err_free_irq;
}
lp->tx_ring = lp->tx_ring =
pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma); pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma);
if (!lp->tx_ring) { if (!lp->tx_ring) {
pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring, ret = -ENOMEM;
lp->rx_ring_dma); goto err_free_rx_ring;
return -ENOMEM;
} }
ret = r6040_up(dev); ret = r6040_up(dev);
if (ret) { if (ret)
pci_free_consistent(lp->pdev, TX_DESC_SIZE, lp->tx_ring, goto err_free_tx_ring;
lp->tx_ring_dma);
pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
lp->rx_ring_dma);
return ret;
}
napi_enable(&lp->napi); napi_enable(&lp->napi);
netif_start_queue(dev); netif_start_queue(dev);
return 0; return 0;
err_free_tx_ring:
pci_free_consistent(lp->pdev, TX_DESC_SIZE, lp->tx_ring,
lp->tx_ring_dma);
err_free_rx_ring:
pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
lp->rx_ring_dma);
err_free_irq:
free_irq(dev->irq, dev);
out:
return ret;
} }
static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,