Re: hostap: fix an error code in prism2_config()

[Kalle Valo]

> The current code returns success if prism2_init_local_data() fails, but
> we want to return an error code.  Also we can remove the bogus
> ret initializer because it is wrong and never used.
> 
> Signed-off-by: Dan Carpenter 

Thanks, applied to wireless-drivers-next.git.

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[patch] hostap: fix an error code in prism2_config()

[Dan Carpenter]

The current code returns success if prism2_init_local_data() fails, but
we want to return an error code.  Also we can remove the bogus
ret initializer because it is wrong and never used.

Signed-off-by: Dan Carpenter 

diff --git a/drivers/net/wireless/intersil/hostap/hostap_cs.c 
b/drivers/net/wireless/intersil/hostap/hostap_cs.c
index 50033aa..74f63b7 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_cs.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_cs.c
@@ -473,7 +473,7 @@ static int prism2_config(struct pcmcia_device *link)
struct net_device *dev;
struct hostap_interface *iface;
local_info_t *local;
-   int ret = 1;
+   int ret;
struct hostap_cs_priv *hw_priv;
unsigned long flags;
 
@@ -502,8 +502,10 @@ static int prism2_config(struct pcmcia_device *link)
/* Need to allocate net_device before requesting IRQ handler */
dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
 &link->dev);
-   if (dev == NULL)
+   if (!dev) {
+   ret = -ENOMEM;
goto failed;
+   }
link->priv = dev;
 
iface = netdev_priv(dev);
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html