diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-10-21 10:14:55 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-21 10:14:55 -0700 |
| commit | f61d081ac09707ee9c947370fadb71dfc859e77f (patch) | |
| tree | 0e7fdde04e3d2ce658b5b3d92616336eda71e892 | |
| parent | 31364ba50850efa708709e22274e3b9d0324bed4 (diff) | |
| parent | ce5c776ed5ed5c8619930387c5c10ec3f0d53047 (diff) | |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.12-merge
| -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 8245ebde727c..fc34f68bc4fe 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1494,7 +1494,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 */ @@ -1503,6 +1503,8 @@ static int __init init(void) return 0; +err_probe: + device_destroy(android_class, dev->dev->devt); err_create: kfree(dev); err_dev: |