Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f64b2e49 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: gadget: fix spin_lock_init() for &uep->lock 



commit 14a8d4bfc2102f85ce097563d151370c91c1898a upstream.

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: default avatarKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Fixes: b8b9c974afee ("usb: renesas_usbhs: gadget: disable all eps when the driver stops")
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarKazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 96285770

drivers/usb/renesas_usbhs/mod_gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,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",
@@ -1151,6 +1150,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)) {