Skip to content

Commit

Permalink
WUSB: fix oops when completing URBs for disconnected devices
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Vrabel authored and Greg Kroah-Hartman committed Apr 17, 2009
1 parent 8db324e commit 5936ac7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions drivers/usb/wusbcore/devconnect.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ static void wusbhc_devconnect_acked_work(struct work_struct *work)
mutex_lock(&wusbhc->mutex);
wusbhc_devconnect_acked(wusbhc, wusb_dev);
mutex_unlock(&wusbhc->mutex);

wusb_dev_put(wusb_dev);
}

/*
Expand Down
6 changes: 4 additions & 2 deletions drivers/usb/wusbcore/wusbhc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

if (status == 0) {
if (status == 0 && wusb_dev) {
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. */
if (!list_empty(&wusb_dev->cack_node))
queue_work(wusbd, &wusb_dev->devconnect_acked_work);
else
wusb_dev_put(wusb_dev);
}

usb_hcd_giveback_urb(&wusbhc->usb_hcd, urb, status);
Expand Down

0 comments on commit 5936ac7

Please sign in to comment.