浏览代码

usb: renesas_usbhs: modify fifo clear timing

Pipe buffer should be cleaned before using it,
but should NOT be cleaned in pipe "prepare" function.
Because the pipe might be working in such timing.
This patch fixup this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kuninori Morimoto 14 年之前
父节点
当前提交
45e13e6e0a
共有 1 个文件被更改,包括 4 次插入10 次删除
  1. 4 10
      drivers/usb/renesas_usbhs/pipe.c

+ 4 - 10
drivers/usb/renesas_usbhs/pipe.c

@@ -369,15 +369,7 @@ static int usbhsp_fifo_select(struct usbhs_pipe *pipe, int write)
 
 int usbhs_fifo_prepare_write(struct usbhs_pipe *pipe)
 {
-	int ret;
-
-	ret = usbhsp_fifo_select(pipe, 1);
-	if (ret < 0)
-		return ret;
-
-	usbhsp_fifo_clear(pipe);
-
-	return ret;
+	return usbhsp_fifo_select(pipe, 1);
 }
 
 int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len)
@@ -392,7 +384,7 @@ int usbhs_fifo_write(struct usbhs_pipe *pipe, u8 *buf, int len)
 	if (ret < 0)
 		return ret;
 
-	ret = usbhs_fifo_prepare_write(pipe);
+	ret = usbhsp_fifo_select(pipe, 1);
 	if (ret < 0)
 		return ret;
 
@@ -750,6 +742,8 @@ void usbhs_pipe_init(struct usbhs_priv *priv)
 
 		usbhsp_flags_init(pipe);
 		pipe->mod_private = NULL;
+
+		usbhsp_fifo_clear(pipe);
 	}
 }