USB: support usb otg and host20 functions

[firefly-linux-kernel-4.4.55.git] / drivers / usb / gadget / android.c

diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c
index d0ec54b810c103dfa6ebc34e139233b00b615162..6de842d6af97455320a6218db32ce090e2a9034d 100644 (file)
--- a/drivers/usb/gadget/android.c
+++ b/drivers/usb/gadget/android.c
@@ -48,8 +48,8 @@ MODULE_VERSION("1.0");
 static const char longname[] = "Gadget Android";
 
 /* Default vendor and product IDs, overridden by userspace */
-#define VENDOR_ID              0x18D1
-#define PRODUCT_ID             0x0001
+#define VENDOR_ID              0x2207
+#define PRODUCT_ID             0x2910
 
 struct android_usb_function {
        char *name;
@@ -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: