| Message ID | 1278767508-10164-1-git-send-email-segooon@gmail.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Jul 10, 2010 at 05:11:47PM +0400, Kulikov Vasiliy wrote: > We must unregister registered device if probe_atmel_card() fails. I think you hit send accidentally on this one? > if (!probe_atmel_card(dev)) { > unregister_netdev(dev); ^^^^^^^^^^^^^^^^^^^^^^^ > - goto err_out_res; > + goto err_out_unreg; > } > > netif_carrier_off(dev); > @@ -1640,6 +1640,9 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, > > return dev; > > +err_out_unreg: > + unregister_netdev(dev); ^^^^^^^^^^^^^^^^^^^^^^ > + What the pants? :P regards, dan carpenter -- 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 Sat, Jul 10, 2010 at 16:12 +0200, Dan Carpenter wrote: > > +err_out_unreg: > > + unregister_netdev(dev); > ^^^^^^^^^^^^^^^^^^^^^^ > > + > > What the pants? :P Hmm, I've slightly misunderstood the code, sorry. Thanks, Dan. -- 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
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index c8f7090..b9334a3 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -1626,7 +1626,7 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, if (!probe_atmel_card(dev)) { unregister_netdev(dev); - goto err_out_res; + goto err_out_unreg; } netif_carrier_off(dev); @@ -1640,6 +1640,9 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, return dev; +err_out_unreg: + unregister_netdev(dev); + err_out_res: release_region(dev->base_addr, 32); err_out_irq:
We must unregister registered device if probe_atmel_card() fails. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> --- drivers/net/wireless/atmel.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)