diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2015-04-24 19:03:37 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-09-18 04:20:37 +0300 |
| commit | b7e7b11a149e6b3a0c12ab3f9699c014d509b615 (patch) | |
| tree | 8e8106b35ff26c39fc454fcfa8a7ffc678b520a7 | |
| parent | 017fd99beb3ccdb301009fa8f905f574e3e3ce29 (diff) | |
| download | linux-b7e7b11a149e6b3a0c12ab3f9699c014d509b615.tar.xz | |
rtlwifi: rtl8192cu: Fix kernel deadlock
commit 414b7e3b9ce8b0577f613e656fdbc36b34b444dd upstream.
The USB mini-driver in rtlwifi, which is used by rtl8192cu, issues a call to
usb_control_msg() with a timeout value of 0. In some instances where the
interface is shutting down, this infinite wait results in a CPU deadlock. A
one second timeout fixes this problem without affecting any normal operations.
This bug is reported at https://bugzilla.novell.com/show_bug.cgi?id=927786.
Reported-by: Bernhard Wiedemann <bwiedemann@suse.com>
Tested-by: Bernhard Wiedemann <bwiedemann@suse.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Bernhard Wiedemann <bwiedemann@suse.com>
Cc: Takashi Iwai<tiwai@suse.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -rw-r--r-- | drivers/net/wireless/rtlwifi/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c index 2b6faa069e9a..9b6cb583883a 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c @@ -119,7 +119,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, do { status = usb_control_msg(udev, pipe, request, reqtype, value, - index, pdata, len, 0); /*max. timeout*/ + index, pdata, len, 1000); if (status < 0) { /* firmware download is checksumed, don't retry */ if ((value >= FW_8192C_START_ADDRESS && |