Merge tag 'for-3.19-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...

[karo-tx-linux.git] / drivers / usb / renesas_usbhs / pipe.c

diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
index 040bcefcb0402c80116b917ea6595e1d01ed0a4d..007f45abe96cf962ce32298b334ef1ece701aac5 100644 (file)
--- a/drivers/usb/renesas_usbhs/pipe.c
+++ b/drivers/usb/renesas_usbhs/pipe.c
@@ -618,8 +618,12 @@ void usbhs_pipe_data_sequence(struct usbhs_pipe *pipe, int sequence)
 
 void usbhs_pipe_clear(struct usbhs_pipe *pipe)
 {
-       usbhsp_pipectrl_set(pipe, ACLRM, ACLRM);
-       usbhsp_pipectrl_set(pipe, ACLRM, 0);
+       if (usbhs_pipe_is_dcp(pipe)) {
+               usbhs_fifo_clear_dcp(pipe);
+       } else {
+               usbhsp_pipectrl_set(pipe, ACLRM, ACLRM);
+               usbhsp_pipectrl_set(pipe, ACLRM, 0);
+       }
 }
 
 static struct usbhs_pipe *usbhsp_get_pipe(struct usbhs_priv *priv, u32 type)