p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hostap: fix an error code in prism2_config() 

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 <dan.carpenter@oracle.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Dan Carpenter 2015-12-04 16:17:46 +03:00 committed by Kalle Valo
parent 97276c10cb
commit 9e4aee43dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/intersil/hostap/hostap_cs.c
View File

@ -473,7 +473,7 @@ static int prism2_config(struct pcmcia_device *link)
struct net_device *dev; struct net_device *dev;
struct hostap_interface *iface; struct hostap_interface *iface;
local_info_t *local; local_info_t *local;
int ret = 1; int ret;
struct hostap_cs_priv *hw_priv; struct hostap_cs_priv *hw_priv;
unsigned long flags; unsigned long flags;
@ -502,8 +502,10 @@ static int prism2_config(struct pcmcia_device *link)
/* Need to allocate net_device before requesting IRQ handler */ /* Need to allocate net_device before requesting IRQ handler */
dev = prism2_init_local_data(&prism2_pccard_funcs, 0, dev = prism2_init_local_data(&prism2_pccard_funcs, 0,
&link->dev); &link->dev);
if (dev == NULL) if (!dev) {
ret = -ENOMEM;
goto failed; goto failed;
}
link->priv = dev; link->priv = dev;
iface = netdev_priv(dev); iface = netdev_priv(dev);