* [PATCH -next-2.6] r6040: Free irq line on error path
@ 2010-08-25 9:57 Denis Kirjanov
2010-08-25 10:05 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: Denis Kirjanov @ 2010-08-25 9:57 UTC (permalink / raw)
To: davem; +Cc: florian, netdev
Free irq line on error path.
Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
drivers/net/r6040.c | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 7d482a2..dc54aff 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -751,7 +751,7 @@ static int r6040_open(struct net_device *dev)
ret = request_irq(dev->irq, r6040_interrupt,
IRQF_SHARED, dev->name, dev);
if (ret)
- return ret;
+ goto out;
/* Set MAC address */
r6040_mac_address(dev);
@@ -759,30 +759,37 @@ static int r6040_open(struct net_device *dev)
/* Allocate Descriptor memory */
lp->rx_ring =
pci_alloc_consistent(lp->pdev, RX_DESC_SIZE, &lp->rx_ring_dma);
- if (!lp->rx_ring)
- return -ENOMEM;
+ if (!lp->rx_ring) {
+ ret = -ENOMEM;
+ goto err_free_irq;
+ }
lp->tx_ring =
pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma);
if (!lp->tx_ring) {
- pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
- lp->rx_ring_dma);
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_free_rx_ring;
}
ret = r6040_up(dev);
- if (ret) {
- pci_free_consistent(lp->pdev, TX_DESC_SIZE, lp->tx_ring,
- lp->tx_ring_dma);
- pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
- lp->rx_ring_dma);
- return ret;
- }
+ if (ret)
+ goto err_free_tx_ring;
napi_enable(&lp->napi);
netif_start_queue(dev);
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,
--
1.6.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH -next-2.6] r6040: Free irq line on error path
2010-08-25 9:57 [PATCH -next-2.6] r6040: Free irq line on error path Denis Kirjanov
@ 2010-08-25 10:05 ` Florian Fainelli
2010-08-25 23:41 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2010-08-25 10:05 UTC (permalink / raw)
To: Denis Kirjanov; +Cc: davem, netdev
On Wednesday 25 August 2010 11:57:55 Denis Kirjanov wrote:
> Free irq line on error path.
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
> ---
> drivers/net/r6040.c | 33 ++++++++++++++++++++-------------
> 1 files changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
> index 7d482a2..dc54aff 100644
> --- a/drivers/net/r6040.c
> +++ b/drivers/net/r6040.c
> @@ -751,7 +751,7 @@ static int r6040_open(struct net_device *dev)
> ret = request_irq(dev->irq, r6040_interrupt,
> IRQF_SHARED, dev->name, dev);
> if (ret)
> - return ret;
> + goto out;
>
> /* Set MAC address */
> r6040_mac_address(dev);
> @@ -759,30 +759,37 @@ static int r6040_open(struct net_device *dev)
> /* Allocate Descriptor memory */
> lp->rx_ring =
> pci_alloc_consistent(lp->pdev, RX_DESC_SIZE, &lp->rx_ring_dma);
> - if (!lp->rx_ring)
> - return -ENOMEM;
> + if (!lp->rx_ring) {
> + ret = -ENOMEM;
> + goto err_free_irq;
> + }
>
> lp->tx_ring =
> pci_alloc_consistent(lp->pdev, TX_DESC_SIZE, &lp->tx_ring_dma);
> if (!lp->tx_ring) {
> - pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
> - lp->rx_ring_dma);
> - return -ENOMEM;
> + ret = -ENOMEM;
> + goto err_free_rx_ring;
> }
>
> ret = r6040_up(dev);
> - if (ret) {
> - pci_free_consistent(lp->pdev, TX_DESC_SIZE, lp->tx_ring,
> - lp->tx_ring_dma);
> - pci_free_consistent(lp->pdev, RX_DESC_SIZE, lp->rx_ring,
> - lp->rx_ring_dma);
> - return ret;
> - }
> + if (ret)
> + goto err_free_tx_ring;
>
> napi_enable(&lp->napi);
> netif_start_queue(dev);
>
> 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,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-08-25 23:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-25 9:57 [PATCH -next-2.6] r6040: Free irq line on error path Denis Kirjanov
2010-08-25 10:05 ` Florian Fainelli
2010-08-25 23:41 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).