diff options
| author |   Lee Jones <lee.jones@linaro.org> | 2012-04-19 10:36:33 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-04-21 16:41:11 -0400 |
| commit | 163faf31778e536ac6125bc8b14f4667adc910e9 (patch) | |
| tree | 6d32a170b6a840600fd2a0243f358587665c1691 /drivers/net/ethernet/smsc/smsc911x.c | |
| parent | drop_monitor: allow more events per second (diff) | |
| download | linux-dev-163faf31778e536ac6125bc8b14f4667adc910e9.tar.xz linux-dev-163faf31778e536ac6125bc8b14f4667adc910e9.zip | |
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/ethernet/smsc/smsc911x.c')
| -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) SET_NETDEV_DEV(dev, &pdev->dev); pdata = netdev_priv(dev); - dev->irq = irq_res->start; irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; pdata->ioaddr = ioremap_nocache(res->start, res_size); @@ -2442,7 +2441,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) if (retval) { SMSC_WARN(pdata, probe, "Unable to claim requested irq: %d", dev->irq); - goto out_free_irq; + goto out_disable_resources; } retval = register_netdev(dev); |