| Message ID | 1334867804-31942-5-git-send-email-lee.jones@linaro.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 19/04/12 21:36, Lee Jones wrote: > 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> > --- > 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 4a69710..f17a76e 100644 > --- a/drivers/net/ethernet/smsc/smsc911x.c > +++ b/drivers/net/ethernet/smsc/smsc911x.c > @@ -2382,7 +2382,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); > @@ -2446,7 +2445,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); Anything on this from the Net guys? Kind regards, Lee
On Fri, May 4, 2012 at 4:10 PM, Lee Jones <lee.jones@linaro.org> wrote: > On 19/04/12 21:36, Lee Jones wrote: >> - goto out_free_irq; >> + goto out_disable_resources; >> } >> >> retval = register_netdev(dev); > > > Anything on this from the Net guys? This was merged for 3.4-rc5, check: https://lkml.org/lkml/2012/4/29/2 Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/05/12 19:22, Linus Walleij wrote: > On Fri, May 4, 2012 at 4:10 PM, Lee Jones<lee.jones@linaro.org> wrote: >> On 19/04/12 21:36, Lee Jones wrote: > >>> - goto out_free_irq; >>> + goto out_disable_resources; >>> } >>> >>> retval = register_netdev(dev); >> >> >> Anything on this from the Net guys? > > This was merged for 3.4-rc5, check: > https://lkml.org/lkml/2012/4/29/2 I actually found that out a few hours ago by accident. Thanks for letting me know though. Kind regards, Lee
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 4a69710..f17a76e 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2382,7 +2382,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); @@ -2446,7 +2445,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);
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> --- drivers/net/ethernet/smsc/smsc911x.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)