| Message ID | 1279020138-9398-1-git-send-email-segooon@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jul 13, 2010 at 03:22:18PM +0400, Kulikov Vasiliy wrote: > Free allocated netdev if no probe is expected. > > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> > --- > drivers/net/eth16i.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c > index 874973f..2bdd394 100644 > --- a/drivers/net/eth16i.c > +++ b/drivers/net/eth16i.c > @@ -1442,8 +1442,10 @@ int __init init_module(void) > dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]); > > if(io[this_dev] == 0) { > - if(this_dev != 0) /* Only autoprobe 1st one */ > + if (this_dev != 0) { /* Only autoprobe 1st one */ > + free_netdev(def); ^^^ free_netdev(dev); regards, dan carpenter > break; > + } > > printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n"); > } > -- -- 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 Tue, Jul 13, 2010 at 13:43 +0200, Dan Carpenter wrote: > On Tue, Jul 13, 2010 at 03:22:18PM +0400, Kulikov Vasiliy wrote: > > Free allocated netdev if no probe is expected. > > > > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> > > --- > > drivers/net/eth16i.c | 4 +++- > > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c > > index 874973f..2bdd394 100644 > > --- a/drivers/net/eth16i.c > > +++ b/drivers/net/eth16i.c > > @@ -1442,8 +1442,10 @@ int __init init_module(void) > > dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]); > > > > if(io[this_dev] == 0) { > > - if(this_dev != 0) /* Only autoprobe 1st one */ > > + if (this_dev != 0) { /* Only autoprobe 1st one */ > > + free_netdev(def); > ^^^ > free_netdev(dev); Heh, this function is surrounded with #ifdef MODULE #endif, so this typo was not detected at my test nonmoduled compilation. Thanks. Patch v2 is comming. > > regards, > dan carpenter > > > break; > > + } > > > > printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n"); > > } > > -- > -- 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/eth16i.c b/drivers/net/eth16i.c index 874973f..2bdd394 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c @@ -1442,8 +1442,10 @@ int __init init_module(void) dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]); if(io[this_dev] == 0) { - if(this_dev != 0) /* Only autoprobe 1st one */ + if (this_dev != 0) { /* Only autoprobe 1st one */ + free_netdev(def); break; + } printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n"); }
Free allocated netdev if no probe is expected. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> --- drivers/net/eth16i.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)