Commit 163faf31 authored by Lee Jones's avatar Lee Jones Committed by David S. Miller

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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbe362be
...@@ -2378,7 +2378,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) ...@@ -2378,7 +2378,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
SET_NETDEV_DEV(dev, &pdev->dev); SET_NETDEV_DEV(dev, &pdev->dev);
pdata = netdev_priv(dev); pdata = netdev_priv(dev);
dev->irq = irq_res->start; dev->irq = irq_res->start;
irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
pdata->ioaddr = ioremap_nocache(res->start, res_size); pdata->ioaddr = ioremap_nocache(res->start, res_size);
...@@ -2442,7 +2441,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) ...@@ -2442,7 +2441,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
if (retval) { if (retval) {
SMSC_WARN(pdata, probe, SMSC_WARN(pdata, probe,
"Unable to claim requested irq: %d", dev->irq); "Unable to claim requested irq: %d", dev->irq);
goto out_free_irq; goto out_disable_resources;
} }
retval = register_netdev(dev); retval = register_netdev(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment