diff options
| author | Felipe Balbi <felipe.balbi@linux.intel.com> | 2018-11-19 08:34:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-05 19:32:13 +0100 |
| commit | 91f1c5c65d733086d1af756e4405b324e87d8bf0 (patch) | |
| tree | dcf0d8e4653fee973e339da9dccf3b822831f0e0 | |
| parent | c7d370712e722fd7205279aa85fb67909db16e59 (diff) | |
| download | linux-stable-91f1c5c65d733086d1af756e4405b324e87d8bf0.tar.gz linux-stable-91f1c5c65d733086d1af756e4405b324e87d8bf0.tar.bz2 linux-stable-91f1c5c65d733086d1af756e4405b324e87d8bf0.zip | |
Revert "usb: dwc3: gadget: skip Set/Clear Halt when invalid"
commit 38317f5c0f2faae5110854f36edad810f841d62f upstream.
This reverts commit ffb80fc672c3a7b6afd0cefcb1524fb99917b2f3.
Turns out that commit is wrong. Host controllers are allowed to use
Clear Feature HALT as means to sync data toggle between host and
periperal.
Cc: <stable@vger.kernel.org>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 2de1a3971a26..558949b826d0 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1461,9 +1461,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) unsigned transfer_in_flight; unsigned started; - if (dep->flags & DWC3_EP_STALL) - return 0; - if (dep->number > 1) trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue); else @@ -1485,8 +1482,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) else dep->flags |= DWC3_EP_STALL; } else { - if (!(dep->flags & DWC3_EP_STALL)) - return 0; ret = dwc3_send_clear_stall_ep_cmd(dep); if (ret) |