diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-08-20 12:22:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:50:35 -0700 |
| commit | b6e99dd6e2c5262e3c2b976d1d5f2c9405433d9a (patch) | |
| tree | 23ce573dd63f7efb919972c00a6c490f15e9d536 | |
| parent | 64f104e89b2b30107a21c5f05c3e2ffa6291e129 (diff) | |
| download | op-kernel-dev-b6e99dd6e2c5262e3c2b976d1d5f2c9405433d9a.zip op-kernel-dev-b6e99dd6e2c5262e3c2b976d1d5f2c9405433d9a.tar.gz | |
[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>
| -rw-r--r-- | drivers/net/wireless/libertas/if_usb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 105a00a..8a3c70e 100644 --- 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); |
