sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

usb: gadget: set composite to NULL when usb_gadget_register_driver fails 

So that it can be tried later again.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-02-07 09:48:51 +01:00
parent 073fb20afe
commit d465cb7a72
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/gadget/composite.c
View File

@ -994,6 +994,8 @@ static struct usb_gadget_driver composite_driver = {
*/
int usb_composite_register(struct usb_composite_driver *driver)
{
int ret;
if (!driver || !driver->dev || !driver->bind || composite)
return -EINVAL;
@ -1002,7 +1004,12 @@ int usb_composite_register(struct usb_composite_driver *driver)
composite_driver.function = (char *) driver->name;
composite = driver;
return usb_gadget_register_driver(&composite_driver);
ret = usb_gadget_register_driver(&composite_driver);
if (ret)
composite = NULL;
return ret;
}
/**