usb: otg: use try_module_get in all usb_get_phy functions and add missing module_put (1dd03d8a) · Commits · 戴 / test

In patch " usb: otg: add device tree support to otg library" devm_usb_get_phy_by_phandle() was added. It uses try_module_get() to lock the phy driver in memory. The corresponding module_put() is missing in that patch. This patch adds try_module_get() to usb_get_phy() and usb_get_phy_dev(). Further the missing module_put() is added to usb_put_phy(). Tested-by:

Steffen Trumtrar <s.trumtrar@pengutronix.de> Reviewed-by:

Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by:

Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by:

Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by:

Felipe Balbi <balbi@ti.com>

drivers/usb/otg/otg.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ struct usb_phy *usb_get_phy(enum usb_phy_type type)
		spin_lock_irqsave(&phy_lock, flags);

		phy = __usb_find_phy(&phy_list, type);
		if (IS_ERR(phy)) {
		if (IS_ERR(phy) \|\| !try_module_get(phy->dev->driver->owner)) {
		pr_err("unable to find transceiver of type %s\n",
		usb_phy_type_string(type));
		goto err0;
		@@ -228,7 +228,7 @@ struct usb_phy usb_get_phy_dev(struct device dev, u8 index)
		spin_lock_irqsave(&phy_lock, flags);

		phy = __usb_find_phy_dev(dev, &phy_bind_list, index);
		if (IS_ERR(phy)) {
		if (IS_ERR(phy) \|\| !try_module_get(phy->dev->driver->owner)) {
		pr_err("unable to find transceiver\n");
		goto err0;
		}
		@@ -301,8 +301,12 @@ EXPORT_SYMBOL(devm_usb_put_phy);
		*/
		void usb_put_phy(struct usb_phy *x)
		{
		if (x)
		if (x) {
		struct module *owner = x->dev->driver->owner;

		put_device(x->dev);
		module_put(owner);
		}
		}
		EXPORT_SYMBOL(usb_put_phy);

Admin message