diff options
author | Lee Jones <lee.jones@linaro.org> | 2012-04-19 06:36:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-21 16:41:11 -0400 |
commit | 163faf31778e536ac6125bc8b14f4667adc910e9 (patch) | |
tree | 6d32a170b6a840600fd2a0243f358587665c1691 /drivers/net | |
parent | bbe362be5368b9f531b95a4a9b502ae2832e1dac (diff) |
drivers/net: Do not free an IRQ if its request failed
Refrain from attempting to free an interrupt line if the request
fails and hence, there is no IRQ to free.
CC: netdev@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 5aa2dbe2bfb5..cd3defb11ffb 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -2378,7 +2378,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
2378 | SET_NETDEV_DEV(dev, &pdev->dev); | 2378 | SET_NETDEV_DEV(dev, &pdev->dev); |
2379 | 2379 | ||
2380 | pdata = netdev_priv(dev); | 2380 | pdata = netdev_priv(dev); |
2381 | |||
2382 | dev->irq = irq_res->start; | 2381 | dev->irq = irq_res->start; |
2383 | irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; | 2382 | irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; |
2384 | pdata->ioaddr = ioremap_nocache(res->start, res_size); | 2383 | pdata->ioaddr = ioremap_nocache(res->start, res_size); |
@@ -2442,7 +2441,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
2442 | if (retval) { | 2441 | if (retval) { |
2443 | SMSC_WARN(pdata, probe, | 2442 | SMSC_WARN(pdata, probe, |
2444 | "Unable to claim requested irq: %d", dev->irq); | 2443 | "Unable to claim requested irq: %d", dev->irq); |
2445 | goto out_free_irq; | 2444 | goto out_disable_resources; |
2446 | } | 2445 | } |
2447 | 2446 | ||
2448 | retval = register_netdev(dev); | 2447 | retval = register_netdev(dev); |