diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-05 20:08:22 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-05 20:08:22 -0800 |
| commit | bc96a4dc0fc041d344d3577b4f65601fb4f8467e (patch) | |
| tree | ddb18b1e2b9bb995e6c587b1b9515b4e7fe8ed27 /drivers/usb | |
| parent | 9fd71eb881758f73c40b016d80c0db0e91830c0b (diff) | |
| parent | 399fa239e44b21cac2b709f3059d4c620294ccbd (diff) | |
Merge "USB: composite: Check return value before composite_setup_complete()"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 018f539054fe..9622514e3df9 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1942,7 +1942,9 @@ unknown: if (value < 0) { DBG(cdev, "ep_queue --> %d\n", value); req->status = 0; - composite_setup_complete(gadget->ep0, req); + if (value != -ESHUTDOWN) + composite_setup_complete(gadget->ep0, + req); } return value; } @@ -2031,7 +2033,8 @@ try_fun_setup: if (value < 0) { DBG(cdev, "ep_queue --> %d\n", value); req->status = 0; - composite_setup_complete(gadget->ep0, req); + if (value != -ESHUTDOWN) + composite_setup_complete(gadget->ep0, req); } } else if (value == USB_GADGET_DELAYED_STATUS && w_length != 0) { WARN(cdev, |