diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2015-04-24 11:03:37 -0500 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:07 +0100 |
| commit | 56e6aa7fc2169206d213bfa2f5c6a481ed9e7722 (patch) | |
| tree | 65ac6f8462401c742431e788d5acb11b359dc662 /drivers/net | |
| parent | a1cd4189c48044fe4d9830b14a1941d0c0c98eb0 (diff) | |
| download | kernel_samsung_smdk4412-56e6aa7fc2169206d213bfa2f5c6a481ed9e7722.zip kernel_samsung_smdk4412-56e6aa7fc2169206d213bfa2f5c6a481ed9e7722.tar.gz kernel_samsung_smdk4412-56e6aa7fc2169206d213bfa2f5c6a481ed9e7722.tar.bz2 | |
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>
[bwh: Backported to 3.2: adjust context, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/net')
| -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 e5fe956..17e6429 100644 --- a/drivers/net/wireless/rtlwifi/usb.c +++ b/drivers/net/wireless/rtlwifi/usb.c @@ -117,7 +117,7 @@ static int _usbctrl_vendorreq_sync_read(struct usb_device *udev, u8 request, reqtype = REALTEK_USB_VENQT_READ; status = usb_control_msg(udev, pipe, request, reqtype, value, index, - pdata, len, 0); /* max. timeout */ + pdata, len, 1000); if (status < 0) pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n", |