aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorMichal Nazarewicz <m.nazarewicz@samsung.com>2010-08-12 11:43:45 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-22 13:21:21 -0400
commitba0534be935d7b24e5fdd6f82c443ee75abc9149 (patch)
tree8a844e03a69aea1bd299525d15749c069fb9538f /drivers/usb/gadget
parent1c6529e92b7682573837e9c9eb7b5ba7a8216a88 (diff)
USB: gadget: g_ffs: 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>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/g_ffs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index a9474f8d532..3c2f0a43c9c 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -53,8 +53,8 @@ MODULE_AUTHOR("Michal Nazarewicz");
53MODULE_LICENSE("GPL"); 53MODULE_LICENSE("GPL");
54 54
55 55
56static unsigned short gfs_vendor_id = 0x0525; /* XXX NetChip */ 56static unsigned short gfs_vendor_id = 0x1d6b; /* Linux Foundation */
57static unsigned short gfs_product_id = 0xa4ac; /* XXX */ 57static unsigned short gfs_product_id = 0x0105; /* FunctionFS Gadget */
58 58
59static struct usb_device_descriptor gfs_dev_desc = { 59static struct usb_device_descriptor gfs_dev_desc = {
60 .bLength = sizeof gfs_dev_desc, 60 .bLength = sizeof gfs_dev_desc,