diff options
| author | Benoit Goby <benoit@android.com> | 2013-10-18 17:16:38 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 13:10:38 -0700 |
| commit | 9a6b71f160d321198bca9454a624173d08d7c5be (patch) | |
| tree | 3e360d0c75e961afa5b2bd204745633ec24fe5f0 /drivers/usb/gadget | |
| parent | ef8ac82cfaf894a2223b08394f44b76f858a9539 (diff) | |
usb: gadget: android: Remove device if probe fails
Make sure the android0 device is removed before we can destroy
the class.
Change-Id: Id584888c407beb80a1df4990f73fe31ccb9d4767
Signed-off-by: Benoit Goby <benoit@android.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/android.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 31f3e009b4a4..a74ae6b26ea9 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1491,7 +1491,7 @@ static int __init init(void) err = usb_composite_probe(&android_usb_driver); if (err) { pr_err("%s: failed to probe driver %d", __func__, err); - goto err_create; + goto err_probe; } /* HACK: exchange composite's setup with ours */ @@ -1500,6 +1500,8 @@ static int __init init(void) return 0; +err_probe: + device_destroy(android_class, dev->dev->devt); err_create: kfree(dev); err_dev: |