aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-13 21:53:16 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:07:26 -0500
commitb926d6b31e2dd8f1bc21a9576aff0e486e21d32a (patch)
treeb78ca8939ce2ff8c74804e4b46cb76a7ead7296a /drivers/net/wireless/libertas
parentd9f88705a7ce2f9ef13d6656ee715493a663edfc (diff)
libertas: stop attempting to reset devices on unload
It wasn't working anyway -- by the time we get into if_usb_disconnect() the USB core has already stopped us talking to the thing; even if it's just on unload and the device still exists. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/if_usb.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 819141652599..25925bd761d8 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -278,16 +278,11 @@ static void if_usb_disconnect(struct usb_interface *intf)
278 cardp->surprise_removed = 1; 278 cardp->surprise_removed = 1;
279 279
280 if (priv) { 280 if (priv) {
281
282 priv->surpriseremoved = 1; 281 priv->surpriseremoved = 1;
283 lbs_stop_card(priv); 282 lbs_stop_card(priv);
284 lbs_remove_card(priv); 283 lbs_remove_card(priv);
285 } 284 }
286 285
287 /* this is (apparently?) necessary for future usage of the device */
288 lbs_prepare_and_send_command(priv, CMD_802_11_RESET, CMD_ACT_HALT,
289 0, 0, NULL);
290
291 /* Unlink and free urb */ 286 /* Unlink and free urb */
292 if_usb_free(cardp); 287 if_usb_free(cardp);
293 288