asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] libertas: fix error handling of card initialization

Browse source 
Subject says it all.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Marcelo Tosatti 2007-05-25 12:09:13 -04:00 committed by John W. Linville
parent 51d84f5016
commit 6a8121572e
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/wireless/libertas/if_usb.c
View file

@ -198,10 +198,10 @@ static int if_usb_probe(struct usb_interface *intf,
goto dealloc;
if (wlan_add_mesh(priv))
goto dealloc;
goto err_add_mesh;
if (libertas_activate_card(priv))
goto dealloc;
goto err_activate_card;
if (libertas_found < MAX_DEVS) {
libertas_devs[libertas_found] = priv->wlan_dev.netdev;
@ -218,6 +218,12 @@ static int if_usb_probe(struct usb_interface *intf,
*/
return 0;
err_activate_card:
unregister_netdev(priv->mesh_dev);
free_netdev(priv->mesh_dev);
err_add_mesh:
free_netdev(priv->wlan_dev.netdev);
kfree(priv->adapter);
dealloc:
if_usb_free(usb_cardp);

1
drivers/net/wireless/libertas/main.c
View file

@ -823,6 +823,7 @@ wlan_private *wlan_add_card(void *card)
err_kzalloc:
free_netdev(dev);
priv = NULL;
done:
lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv);
return priv;