diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-04-27 04:02:15 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-04-27 04:02:15 -0400 |
| commit | 83a787a71e034244a9fd1d5988fe18f226341417 (patch) | |
| tree | 4ed07aa897320c5f1f24a77209ca0543be0be58b | |
| parent | 15b120d67019d691e4389372967332d74a80522a (diff) | |
usb: gadget: udc-core: fix wrong call order
commit 6d258a4 (usb: gadget: udc-core: stop UDC on device-initiated
disconnect) introduced another case of asymmetric calls when issuing
a device-initiated disconnect. Fix it.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/udc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index 2fa9865babed..df1bd87232dd 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c | |||
| @@ -415,9 +415,9 @@ static ssize_t usb_udc_softconn_store(struct device *dev, | |||
| 415 | usb_gadget_udc_start(udc->gadget, udc->driver); | 415 | usb_gadget_udc_start(udc->gadget, udc->driver); |
| 416 | usb_gadget_connect(udc->gadget); | 416 | usb_gadget_connect(udc->gadget); |
| 417 | } else if (sysfs_streq(buf, "disconnect")) { | 417 | } else if (sysfs_streq(buf, "disconnect")) { |
| 418 | usb_gadget_disconnect(udc->gadget); | ||
| 418 | if (udc_is_newstyle(udc)) | 419 | if (udc_is_newstyle(udc)) |
| 419 | usb_gadget_udc_stop(udc->gadget, udc->driver); | 420 | usb_gadget_udc_stop(udc->gadget, udc->driver); |
| 420 | usb_gadget_disconnect(udc->gadget); | ||
| 421 | } else { | 421 | } else { |
| 422 | dev_err(dev, "unsupported command '%s'\n", buf); | 422 | dev_err(dev, "unsupported command '%s'\n", buf); |
| 423 | return -EINVAL; | 423 | return -EINVAL; |
