Commit dc50a52a authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville

Revert "rt2x00: Endless loop on hub port power down"

This reverts commit 2ad69ac5. It
causes wireless device disappear when we get -EPROTO error form USB
request. I encounter such situation occasionally when resume form
suspend with RT3070 adapter:

[  289.619985] ieee80211 phy0: rt2x00usb_vendor_request: Error - Vendor Request 0x06 failed for offset 0x0404 with error -71
[  289.639368] ieee80211 phy0: rt2800_wait_bbp_ready: Error - BBP register access failed, aborting
[  289.639374] ieee80211 phy0: rt2800usb_set_device_state: Error - Device failed to enter state 4 (-5)

Without the patch, except printing error, device works just fine after
resume.

Currently after timeouts and REGISTER_BUSY_COUNT tuning, we should
not have any "endless loop", though we can wait quite long when driver
is trying to communicate with the device through non functioning USB
connection. Generally the problem that commit 2ad69ac5 solves
is kinda artificial.

Cc: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 14bc8bde
...@@ -64,12 +64,6 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev, ...@@ -64,12 +64,6 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
} }
} while (time_before(jiffies, expire)); } while (time_before(jiffies, expire));
/* If the port is powered down, we get a -EPROTO error, and this
* leads to a endless loop. So just say that the device is gone.
*/
if (status == -EPROTO)
clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags);
rt2x00_err(rt2x00dev, rt2x00_err(rt2x00dev,
"Vendor Request 0x%02x failed for offset 0x%04x with error %d\n", "Vendor Request 0x%02x failed for offset 0x%04x with error %d\n",
request, offset, status); request, offset, status);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment