projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| bb025da9 GKH |
1 | From 1c6529e92b7682573837e9c9eb7b5ba7a8216a88 Mon Sep 17 00:00:00 2001 |
| 2 | From: Michal Nazarewicz <m.nazarewicz@samsung.com> | |
| 3 | Date: Thu, 12 Aug 2010 17:43:44 +0200 | |
| 4 | Subject: USB: gadget: g_multi: fixed vendor and product ID | |
| 5 | ||
| 6 | From: Michal Nazarewicz <m.nazarewicz@samsung.com> | |
| 7 | ||
| 8 | commit 1c6529e92b7682573837e9c9eb7b5ba7a8216a88 upstream. | |
| 9 | ||
| 10 | This patch fixes the vendor and product ID the gadget uses | |
| 11 | by replacing the temporary IDs that were used during | |
| 12 | development (which should never get into mainline) with | |
| 13 | proper IDs. | |
| 14 | ||
| 15 | Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com> | |
| 16 | Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/usb/gadget/multi.c | 4 ++-- | |
| 21 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 22 | ||
| 23 | --- a/drivers/usb/gadget/multi.c | |
| 24 | +++ b/drivers/usb/gadget/multi.c | |
| 25 | @@ -39,8 +39,8 @@ | |
| 26 | ||
| 27 | /*-------------------------------------------------------------------------*/ | |
| 28 | ||
| 29 | -#define MULTI_VENDOR_NUM 0x0525 /* XXX NetChip */ | |
| 30 | -#define MULTI_PRODUCT_NUM 0xa4ab /* XXX */ | |
| 31 | +#define MULTI_VENDOR_NUM 0x1d6b /* Linux Foundation */ | |
| 32 | +#define MULTI_PRODUCT_NUM 0x0104 /* Multifunction Composite Gadget */ | |
| 33 | ||
| 34 | /*-------------------------------------------------------------------------*/ | |
| 35 |