Skip to content

Commit

Permalink
USB: g_hid: unregister platform driver on probe/usb_composite_registe…
Browse files Browse the repository at this point in the history
…r errors

Otherwise reloads will fail.

Signed-off-by: Peter Korsgaard <peter.korsgaard@barco.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Peter Korsgaard authored and Greg Kroah-Hartman committed May 20, 2010
1 parent fe662b4 commit da01c7a
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions drivers/usb/gadget/hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,18 @@ MODULE_LICENSE("GPL");

static int __init hidg_init(void)
{
platform_driver_probe(&hidg_plat_driver, hidg_plat_driver_probe);
return usb_composite_register(&hidg_driver);
int status;

status = platform_driver_probe(&hidg_plat_driver,
hidg_plat_driver_probe);
if (status < 0)
return status;

status = usb_composite_register(&hidg_driver);
if (status < 0)
platform_driver_unregister(&hidg_plat_driver);

return status;
}
module_init(hidg_init);

Expand Down

0 comments on commit da01c7a

Please sign in to comment.