hostap: fix an error code in prism2_config()
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 4 Dec 2015 13:17:46 +0000 (16:17 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 11 Dec 2015 11:22:04 +0000 (13:22 +0200)
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>
drivers/net/wireless/intersil/hostap/hostap_cs.c

index 50033aa..74f63b7 100644 (file)
@@ -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);