staging: rtl8192u: improve error path
Subsystems (2)
PATCH 6/14 staging: rtl8192u: improve error path
From: Vasiliy Kulikov <[email protected]>
Functions alloc_ieee80211 and register_netdev may fail. Check for it.
---
I couldn't compile this driver at all, so it is not tested.
drivers/staging/rtl8192u/r8192U_core.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +18 -5
@@ -5793,10 +5793,12 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,struct net_device *dev =NULL ;struct r8192_priv *priv=NULL ;struct usb_device *udev =interface_to_usbdev (intf); +int ret;RT_TRACE (COMP_INIT ,"Oops: i'm coming\n" ); dev =alloc_ieee80211 (sizeof (struct r8192_priv )); - +if (dev =NULL ) +return -ENOMEM ;usb_set_intfdata (intf, dev);SET_NETDEV_DEV (dev, &intf->dev);
@@ -5826,12 +5828,16 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,RT_TRACE (COMP_INIT ,"Driver probe completed1\n" );if (rtl8192_init (dev)!=0 ){RT_TRACE (COMP_ERR ,"Initialization failed" ); + ret = -ENODEV ; goto fail; }netif_carrier_off (dev);netif_stop_queue (dev); -register_netdev (dev); + ret =register_netdev (dev); +if (ret) + goto fail2; +RT_TRACE (COMP_INIT ,"dev name====> %s\n" ,dev->name);rtl8192_proc_init_one (dev);
@@ -5839,13 +5845,20 @@ static int __devinit rtl8192_usb_probe(struct usb_interface *intf,RT_TRACE (COMP_INIT ,"Driver probe completed\n" );return 0 ; - +fail2: +rtl8192_down (dev); +if (priv->pFirmware) { +kfree (priv->pFirmware); + priv->pFirmware =NULL ; + } +rtl8192_usb_deleteendpoints (dev); +destroy_workqueue (priv->priv_wq); +mdelay (10 ); fail:free_ieee80211 (dev);RT_TRACE (COMP_ERR ,"wlan driver load failed\n" ); -return -ENODEV ; - +return ret; }//detach all the work and timer structure declared or inititialize in r8192U_init function.
Signature · 1 line
1.7.0.4
drivers/staging/rtl8192u/r8192U_core.c static int __devinit rtl8192_usb_probe(struct usb_interface *intf, · line 5856
Quoted 9 lines · Kulikov Vasiliy
drivers/staging/rtl8192u/r8192U_core.c +9
-0+fail2: +rtl8192_down (dev); +if (priv->pFirmware) { +kfree (priv->pFirmware); + priv->pFirmware =NULL ; + } +rtl8192_usb_deleteendpoints (dev); +destroy_workqueue (priv->priv_wq); +mdelay (10 );
What's this delay for?
regards,
dan carpenter
Quoted 2 lines
fail:
free_ieee80211(dev);
Quoted 12 lines · Dan Carpenter
drivers/staging/rtl8192u/r8192U_core.c static int __devinit rtl8192_usb_probe(struct usb_interface *intf, · line 5856
Quoted 9 lines · Kulikov Vasiliy
drivers/staging/rtl8192u/r8192U_core.c +9
-0+fail2: +rtl8192_down (dev); +if (priv->pFirmware) { +kfree (priv->pFirmware); + priv->pFirmware =NULL ; + } +rtl8192_usb_deleteendpoints (dev); +destroy_workqueue (priv->priv_wq); +mdelay (10 );What's this delay for?
It was copied from rtl8192_usb_disconnect(), I don't know why it has mdelay(10). But it's better to keep the old deallocation code, it should have the same problems (if original code has any).
Signature · 1 line
Vasiliy
Quoted 14 lines · Kulikov Vasiliy
Quoted 12 lines · Dan Carpenter
drivers/staging/rtl8192u/r8192U_core.c static int __devinit rtl8192_usb_probe(struct usb_interface *intf, · line 5856
Quoted 9 lines · Kulikov Vasiliy
drivers/staging/rtl8192u/r8192U_core.c +9
-0+fail2: +rtl8192_down (dev); +if (priv->pFirmware) { +kfree (priv->pFirmware); + priv->pFirmware =NULL ; + } +rtl8192_usb_deleteendpoints (dev); +destroy_workqueue (priv->priv_wq); +mdelay (10 );What's this delay for?
Quoted 4 lines
It was copied from
rtl8192_usb_disconnect(), I don't know why it has mdelay(10). But it's better to keep the old deallocation code, it should have the same problems (if original code has any).
I think the delay in rtl8192_usb_disconnect() is because we reset the device. (Of course, in that case, it would have been better to move the delay into rtl8192_reset(). And also the reset code has been commented out.)
In this case here, the delay is serves no purpose and should be removed.
regards,
dan carpenter