[PATCH] libertas: send reset command directly instead of calling libertas_reset_device

Ensures that any platform specific code that might live in libertas_reset_device
(for example, OLPC tells the EC to do a GPIO-toggled reset of the wireless
from libertas_reset_device) isn't called.  Could be handled better by
interface-specific callbacks and a flag for "other hardware reset".

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Marcelo Tosatti <marcelo@kvack.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 105a00a7025dd9ec2a5d5bfb6e23f59d8016f30f..8a3c70e5407565648c345be6dad970539af700c9 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -1044,8 +1044,10 @@ static void if_usb_exit_module(void)
 
        lbs_deb_enter(LBS_DEB_MAIN);
 
-       list_for_each_entry_safe(cardp, cardp_temp, &usb_devices, list)
-               libertas_reset_device((wlan_private *) cardp->priv);
+       list_for_each_entry_safe(cardp, cardp_temp, &usb_devices, list) {
+               libertas_prepare_and_send_command(cardp->priv, CMD_802_11_RESET,
+                                                 CMD_ACT_HALT, 0, 0, NULL);
+       }
 
        /* API unregisters the driver from USB subsystem */
        usb_deregister(&if_usb_driver);