summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Nazarewicz <m.nazarewicz@samsung.com>2010-08-12 17:43:44 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 19:21:21 +0200
commit1c6529e92b7682573837e9c9eb7b5ba7a8216a88 (patch)
tree9e9c254a4cf1e6bdf84bdcd70d0f066e83b87eea
parentUSB: core: update comment to match current function name (diff)
downloadlinux-1c6529e92b7682573837e9c9eb7b5ba7a8216a88.tar.xz
linux-1c6529e92b7682573837e9c9eb7b5ba7a8216a88.zip
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>
-rw-r--r--drivers/usb/gadget/multi.c4
1 files changed, 2 insertions, 2 deletions
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 {