diff options
| author |   Christian Lamparter <chunkeey@googlemail.com> | 2010-09-17 22:58:40 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-09-21 11:05:24 -0400 |
| commit | 78ec789bd397249a9bb412ca91bd360079e7b446 (patch) | |
| tree | b7296e1a0888f76bd17b908eeceb1d337da35807 /drivers/net/wireless/ath/carl9170/usb.c | |
| parent | carl9170: abort tasklet during usb reset (diff) | |
| download | linux-dev-78ec789bd397249a9bb412ca91bd360079e7b446.tar.xz linux-dev-78ec789bd397249a9bb412ca91bd360079e7b446.zip | |
carl9170: fix state downgrade during reset
Don't mark the device as completely dead just yet.
If all goes to plan and carl9170_reboot succeeds
then we can skip the expensive userspace-driven
reinitialization anyway.
And if it doesn't and carl9170_reboot fails,
then carl9170_usb_cancel_urbs will do the
necessary steps.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/usb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c index 1e7c2748d85a..eb789a9e4f15 100644 --- a/drivers/net/wireless/ath/carl9170/usb.c +++ b/drivers/net/wireless/ath/carl9170/usb.c @@ -846,8 +846,6 @@ int carl9170_usb_restart(struct ar9170 *ar) carl9170_usb_stop(ar); - carl9170_set_state(ar, CARL9170_UNKNOWN_STATE); - if (err) goto err_out; |