| From 5c668dd496376a1331c9d4c5396a3921c09568c1 Mon Sep 17 00:00:00 2001 |
| From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Date: Wed, 9 Aug 2017 19:55:24 +0900 |
| Subject: usb: renesas_usbhs: gadget: fix spin_lock_init() for &uep->lock |
| |
| [ Upstream commit 14a8d4bfc2102f85ce097563d151370c91c1898a ] |
| |
| This patch fixes an issue that the spin_lock_init() is not called |
| for almost all pipes. Otherwise, the lockdep output the following |
| message when we connect a usb cable using g_ncm: |
| |
| INFO: trying to register non-static key. |
| the code is fine but needs lockdep annotation. |
| turning off the locking correctness validator. |
| |
| Reported-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> |
| Fixes: b8b9c974afee ("usb: renesas_usbhs: gadget: disable all eps when the driver stops") |
| Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> |
| Tested-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/renesas_usbhs/mod_gadget.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c |
| index 93fba9033b00..54a3237aac08 100644 |
| --- a/drivers/usb/renesas_usbhs/mod_gadget.c |
| +++ b/drivers/usb/renesas_usbhs/mod_gadget.c |
| @@ -1085,7 +1085,6 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv) |
| ret = -ENOMEM; |
| goto usbhs_mod_gadget_probe_err_gpriv; |
| } |
| - spin_lock_init(&uep->lock); |
| |
| gpriv->transceiver = usb_get_phy(USB_PHY_TYPE_UNDEFINED); |
| dev_info(dev, "%stransceiver found\n", |
| @@ -1135,6 +1134,7 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv) |
| uep->ep.name = uep->ep_name; |
| uep->ep.ops = &usbhsg_ep_ops; |
| INIT_LIST_HEAD(&uep->ep.ep_list); |
| + spin_lock_init(&uep->lock); |
| |
| /* init DCP */ |
| if (usbhsg_is_dcp(uep)) { |
| -- |
| 2.17.1 |
| |
