| From b0c870570a26069f023f0b2825f5f9221a54c2b4 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Tue, 1 Oct 2019 19:10:32 +0900 |
| Subject: [PATCH] usb: renesas_usbhs: gadget: Do not discard queues in |
| usb_ep_set_{halt,wedge}() |
| |
| commit 1aae1394294cb71c6aa0bc904a94a7f2f1e75936 upstream. |
| |
| The commit 97664a207bc2 ("usb: renesas_usbhs: shrink spin lock area") |
| had added a usbhsg_pipe_disable() calling into |
| __usbhsg_ep_set_halt_wedge() accidentally. But, this driver should |
| not call the usbhsg_pipe_disable() because the function discards |
| all queues. So, this patch removes it. |
| |
| Fixes: 97664a207bc2 ("usb: renesas_usbhs: shrink spin lock area") |
| Cc: <stable@vger.kernel.org> # v3.1+ |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Link: https://lore.kernel.org/r/1569924633-322-2-git-send-email-yoshihiro.shimoda.uh@renesas.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c |
| index 59cac40aafcc..821de98e6441 100644 |
| --- a/drivers/usb/renesas_usbhs/mod_gadget.c |
| +++ b/drivers/usb/renesas_usbhs/mod_gadget.c |
| @@ -722,8 +722,6 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) |
| struct device *dev = usbhsg_gpriv_to_dev(gpriv); |
| unsigned long flags; |
| |
| - usbhsg_pipe_disable(uep); |
| - |
| dev_dbg(dev, "set halt %d (pipe %d)\n", |
| halt, usbhs_pipe_number(pipe)); |
| |
| -- |
| 2.7.4 |
| |
