diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-24 11:47:42 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-24 11:47:42 -0800 |
| commit | a5856ce00674aa34a38a55dd6960638182604d91 (patch) | |
| tree | 2f4d7d75a1eeac8d222570e8ad3db1346e1658c4 | |
| parent | 01de8cb7aaf15245338261b25531736030be4063 (diff) | |
| parent | 70ee83c5d185b6ac1026b8e6e5e31616ebe39320 (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
| -rw-r--r-- | drivers/usb/gadget/android.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 8e6cafc851cb..7017e23a80ad 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -344,6 +344,7 @@ static int android_bind(struct usb_composite_dev *cdev) dev->cdev = cdev; device_desc.idVendor = __constant_cpu_to_le16(get_vendor_id(dev)); device_desc.idProduct = __constant_cpu_to_le16(get_product_id(dev)); + cdev->desc.idVendor = device_desc.idVendor; cdev->desc.idProduct = device_desc.idProduct; return 0; @@ -436,8 +437,10 @@ void android_enable_function(struct usb_function *f, int enable) device_desc.idVendor = __constant_cpu_to_le16(get_vendor_id(dev)); device_desc.idProduct = __constant_cpu_to_le16(get_product_id(dev)); - if (dev->cdev) + if (dev->cdev) { + dev->cdev->desc.idVendor = device_desc.idVendor; dev->cdev->desc.idProduct = device_desc.idProduct; + } usb_composite_force_reset(dev->cdev); } } |