hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WUSB: fix oops when completing URBs for disconnected devices 

Fix an oops in wusbhc_giveback_urb() if the wusb device had disconnected
while an urb was in progress. Also release the ref count obtained here.

Signed-off-by: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
David Vrabel 2009-04-08 17:36:32 +00:00 committed by Greg Kroah-Hartman
parent 8db324ec43
commit 5936ac7f93
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/wusbcore/devconnect.c
View File

@ -267,6 +267,8 @@ static void wusbhc_devconnect_acked_work(struct work_struct *work)
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
wusbhc_devconnect_acked(wusbhc, wusb_dev); wusbhc_devconnect_acked(wusbhc, wusb_dev);
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
wusb_dev_put(wusb_dev);
} }
/* /*

6
drivers/usb/wusbcore/wusbhc.c
View File

@ -339,13 +339,15 @@ void wusbhc_giveback_urb(struct wusbhc *wusbhc, struct urb *urb, int status)
{ {
struct wusb_dev *wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev); struct wusb_dev *wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev);
if (status == 0) { if (status == 0 && wusb_dev) {
wusb_dev->entry_ts = jiffies; wusb_dev->entry_ts = jiffies;
/* wusbhc_devconnect_acked() can't be called from from /* wusbhc_devconnect_acked() can't be called from
atomic context so defer it to a work queue. */ atomic context so defer it to a work queue. */
if (!list_empty(&wusb_dev->cack_node)) if (!list_empty(&wusb_dev->cack_node))
queue_work(wusbd, &wusb_dev->devconnect_acked_work); queue_work(wusbd, &wusb_dev->devconnect_acked_work);
else
wusb_dev_put(wusb_dev);
} }
usb_hcd_giveback_urb(&wusbhc->usb_hcd, urb, status); usb_hcd_giveback_urb(&wusbhc->usb_hcd, urb, status);