diff options
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 480fd0822e4a..dab9c6f671ec 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -2379,7 +2379,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
2379 | SET_NETDEV_DEV(dev, &pdev->dev); | 2379 | SET_NETDEV_DEV(dev, &pdev->dev); |
2380 | 2380 | ||
2381 | pdata = netdev_priv(dev); | 2381 | pdata = netdev_priv(dev); |
2382 | |||
2383 | dev->irq = irq_res->start; | 2382 | dev->irq = irq_res->start; |
2384 | irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; | 2383 | irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; |
2385 | pdata->ioaddr = ioremap_nocache(res->start, res_size); | 2384 | pdata->ioaddr = ioremap_nocache(res->start, res_size); |
@@ -2443,7 +2442,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | |||
2443 | if (retval) { | 2442 | if (retval) { |
2444 | SMSC_WARN(pdata, probe, | 2443 | SMSC_WARN(pdata, probe, |
2445 | "Unable to claim requested irq: %d", dev->irq); | 2444 | "Unable to claim requested irq: %d", dev->irq); |
2446 | goto out_free_irq; | 2445 | goto out_disable_resources; |
2447 | } | 2446 | } |
2448 | 2447 | ||
2449 | retval = register_netdev(dev); | 2448 | retval = register_netdev(dev); |