openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lee Jones 2012-04-19 10:36:33 +00:00 committed by David S. Miller
parent bbe362be53
commit 163faf3177
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/smsc/smsc911x.c
View File

@ -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)
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);