diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:42:51 +0200 |
commit | 51fa228c8e05c58f51c97bbc571be94c4592a85e (patch) | |
tree | 494028747238cf9edb0f6187f1bfaeccc762ceb0 /drivers/usb/core/devio.c | |
parent | 92b8608691bf129b1137be46a3a0058bcacc97a9 (diff) | |
parent | d45331b00ddb179e291766617259261c112db872 (diff) |
Merge 5.3-rc4 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/devio.c')
-rw-r--r-- | drivers/usb/core/devio.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c index cdd34dcb2395..5db7b6dbcb44 100644 --- a/drivers/usb/core/devio.c +++ b/drivers/usb/core/devio.c @@ -1843,8 +1843,6 @@ static int proc_do_submiturb(struct usb_dev_state *ps, struct usbdevfs_urb *uurb return 0; error: - if (as && as->usbm) - dec_usb_memory_use_count(as->usbm, &as->usbm->urb_use_count); kfree(isopkt); kfree(dr); if (as) |