diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
| commit | 76e8de404a34bfff318da0b31e752db2642511f3 (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /drivers/usb/gadget/android.c | |
| parent | e9b3bd248b349433215cf01064a866b632fb3f4b (diff) | |
| parent | 354d86f4daecdc3553830e553f6fc17add736234 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultzv3.10/topic/android-fixes
Diffstat (limited to 'drivers/usb/gadget/android.c')
| -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 d0ec54b810c..04cbeb13481 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1490,7 +1490,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 */ @@ -1499,6 +1499,8 @@ static int __init init(void) return 0; +err_probe: + device_destroy(android_class, dev->dev->devt); err_create: kfree(dev); err_dev: |