From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 22 Dec 2010 20:25:34 +0000 (-0800)
Subject: USB: Merge 2.6.37-rc5 into usb-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2af10844eb6ed104f9505bf3a7ba3ceb02264f31;p=linux-beck.git

USB: Merge 2.6.37-rc5 into usb-next

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

2af10844eb6ed104f9505bf3a7ba3ceb02264f31
diff --cc drivers/usb/gadget/composite.c
index 21dc0da36ab7,8572dad5ecbb..f6ff8456d52d
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@@ -1126,7 -1118,15 +1118,15 @@@ static int composite_bind(struct usb_ga
  	cdev->desc = *composite->dev;
  	cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
  
+ 	/* standardized runtime overrides for device ID data */
+ 	if (idVendor)
+ 		cdev->desc.idVendor = cpu_to_le16(idVendor);
+ 	if (idProduct)
+ 		cdev->desc.idProduct = cpu_to_le16(idProduct);
+ 	if (bcdDevice)
+ 		cdev->desc.bcdDevice = cpu_to_le16(bcdDevice);
+ 
 -	/* stirng overrides */
 +	/* string overrides */
  	if (iManufacturer || !cdev->desc.iManufacturer) {
  		if (!iManufacturer && !composite->iManufacturer &&
  		    !*composite_manufacturer)