blob: b59beaba636ba985ed3d59248884f3e8876042bb [file] [log] [blame]
From ltsi-dev-bounces@lists.linuxfoundation.org Tue Feb 12 20:55:41 2013
From: Do Quang Thang <dq-thang@jinso.co.jp>
Date: Wed, 13 Feb 2013 13:23:50 +0900
Subject: [PATCH 02/10] Revert "usb: renesas_usbhs: gadget: remove usbhsg_uep_init()"
To: ltsi-dev@lists.linuxfoundation.org
Message-ID: <1360729438-10731-3-git-send-email-dq-thang@jinso.co.jp>
This reverts commit f1b8894e20b3b92524473ab7e8f2eee3e581d708.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Do Quang Thang <dq-thang@jinso.co.jp>
---
drivers/usb/renesas_usbhs/mod_gadget.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--- a/drivers/usb/renesas_usbhs/mod_gadget.c
+++ b/drivers/usb/renesas_usbhs/mod_gadget.c
@@ -541,6 +541,15 @@ static int usbhsg_pipe_disable(struct us
return 0;
}
+static void usbhsg_uep_init(struct usbhsg_gpriv *gpriv)
+{
+ int i;
+ struct usbhsg_uep *uep;
+
+ usbhsg_for_each_uep_with_dcp(uep, gpriv, i)
+ uep->pipe = NULL;
+}
+
/*
*
* usb_ep_ops
@@ -751,6 +760,7 @@ static int usbhsg_try_start(struct usbhs
usbhs_pipe_init(priv,
usbhsg_dma_map_ctrl);
usbhs_fifo_init(priv);
+ usbhsg_uep_init(gpriv);
/* dcp init */
dcp->pipe = usbhs_dcp_malloc(priv);
@@ -963,7 +973,6 @@ int usbhs_mod_gadget_probe(struct usbhs_
*/
usbhsg_for_each_uep_with_dcp(uep, gpriv, i) {
uep->gpriv = gpriv;
- uep->pipe = NULL;
snprintf(uep->ep_name, EP_NAME_SIZE, "ep%d", i);
uep->ep.name = uep->ep_name;