From: Michal Nazarewicz <m.nazarewicz@samsung.com>
Date: Thu, 12 Aug 2010 15:43:44 +0000 (+0200)
Subject: USB: gadget: g_multi: fixed vendor and product ID
X-Git-Tag: MMI-PSA29.97-13-9~22001^2~130
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c6529e92b7682573837e9c9eb7b5ba7a8216a88;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

USB: gadget: g_multi: fixed vendor and product ID

This patch fixes the vendor and product ID the gadget uses
by replacing the temporary IDs that were used during
development (which should never get into mainline) with
proper IDs.

Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index 795d76232167..36d67a32abef 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -74,8 +74,8 @@ MODULE_LICENSE("GPL");
 
 /***************************** Device Descriptor ****************************/
 
-#define MULTI_VENDOR_NUM	0x0525	/* XXX NetChip */
-#define MULTI_PRODUCT_NUM	0xa4ab	/* XXX */
+#define MULTI_VENDOR_NUM	0x1d6b	/* Linux Foundation */
+#define MULTI_PRODUCT_NUM	0x0104	/* Multifunction Composite Gadget */
 
 
 enum {