lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usb: renesas_usbhs: fixup device_register timing

Browse Source 
current renesas_usbhs is using new style udc_start/stop from
af1d7056a5
(usb: gadget: renesas: convert to new style).

But bind() function will fail if it was called before
device_register() (or device_add()).
This patch modifies this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kuninori Morimoto
2011-11-17 18:19:06 -08:00
committed by Greg Kroah-Hartman
parent 5d193ce8f1
commit f8eff0a061
1 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/usb/renesas_usbhs/mod_gadget.c
View File

@@ -751,53 +751,31 @@ static int usbhsg_gadget_start(struct usb_gadget *gadget,
struct usb_gadget_driver *driver) struct usb_gadget_driver *driver)
{ {
struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget); struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
struct usbhs_priv *priv; struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
struct device *dev;
int ret;
if (!driver || if (!driver ||
!driver->setup || !driver->setup ||
driver->speed != USB_SPEED_HIGH) driver->speed != USB_SPEED_HIGH)
return -EINVAL; return -EINVAL;
dev = usbhsg_gpriv_to_dev(gpriv);
priv = usbhsg_gpriv_to_priv(gpriv);
/* first hook up the driver ... */ /* first hook up the driver ... */
gpriv->driver = driver; gpriv->driver = driver;
gpriv->gadget.dev.driver = &driver->driver; gpriv->gadget.dev.driver = &driver->driver;
ret = device_add(&gpriv->gadget.dev);
if (ret) {
dev_err(dev, "device_add error %d\n", ret);
goto add_fail;
}
return usbhsg_try_start(priv, USBHSG_STATUS_REGISTERD); return usbhsg_try_start(priv, USBHSG_STATUS_REGISTERD);
add_fail:
gpriv->driver = NULL;
gpriv->gadget.dev.driver = NULL;
return ret;
} }
static int usbhsg_gadget_stop(struct usb_gadget *gadget, static int usbhsg_gadget_stop(struct usb_gadget *gadget,
struct usb_gadget_driver *driver) struct usb_gadget_driver *driver)
{ {
struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget); struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
struct usbhs_priv *priv; struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
struct device *dev;
if (!driver || if (!driver ||
!driver->unbind) !driver->unbind)
return -EINVAL; return -EINVAL;
dev = usbhsg_gpriv_to_dev(gpriv);
priv = usbhsg_gpriv_to_priv(gpriv);
usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD); usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
device_del(&gpriv->gadget.dev);
gpriv->driver = NULL; gpriv->driver = NULL;
return 0; return 0;
@@ -876,12 +854,14 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
/* /*
* init gadget * init gadget
*/ */
device_initialize(&gpriv->gadget.dev);
dev_set_name(&gpriv->gadget.dev, "gadget"); dev_set_name(&gpriv->gadget.dev, "gadget");
gpriv->gadget.dev.parent = dev; gpriv->gadget.dev.parent = dev;
gpriv->gadget.name = "renesas_usbhs_udc"; gpriv->gadget.name = "renesas_usbhs_udc";
gpriv->gadget.ops = &usbhsg_gadget_ops; gpriv->gadget.ops = &usbhsg_gadget_ops;
gpriv->gadget.is_dualspeed = 1; gpriv->gadget.is_dualspeed = 1;
ret = device_register(&gpriv->gadget.dev);
if (ret < 0)
goto err_add_udc;
INIT_LIST_HEAD(&gpriv->gadget.ep_list); INIT_LIST_HEAD(&gpriv->gadget.ep_list);
@@ -912,12 +892,15 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
ret = usb_add_gadget_udc(dev, &gpriv->gadget); ret = usb_add_gadget_udc(dev, &gpriv->gadget);
if (ret) if (ret)
goto err_add_udc; goto err_register;
dev_info(dev, "gadget probed\n"); dev_info(dev, "gadget probed\n");
return 0; return 0;
err_register:
device_unregister(&gpriv->gadget.dev);
err_add_udc: err_add_udc:
kfree(gpriv->uep); kfree(gpriv->uep);
@@ -933,6 +916,8 @@ void usbhs_mod_gadget_remove(struct usbhs_priv *priv)
usb_del_gadget_udc(&gpriv->gadget); usb_del_gadget_udc(&gpriv->gadget);
device_unregister(&gpriv->gadget.dev);
usbhsg_controller_unregister(gpriv); usbhsg_controller_unregister(gpriv);
kfree(gpriv->uep); kfree(gpriv->uep);