diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2012-11-15 14:17:20 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2012-11-21 10:13:50 +0530 |
| commit | acaa56140610706e0ed469020d53332254179403 (patch) | |
| tree | b2260b63e8e9faa42655be4468697ca9fb9899da | |
| parent | 9b3eb076f9c1cb5a60e1f3969617c1cf00b08269 (diff) | |
usb: gadget: android: Fix build error because of removal of usb_gadget_controller_number
Required as per commit ed9cbda ("usb: gadget: remove
usb_gadget_controller_number()").
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | drivers/usb/gadget/android.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index d2c3393237b..c26d7be819e 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1118,7 +1118,7 @@ static int android_bind(struct usb_composite_dev *cdev) { struct android_dev *dev = _android_dev; struct usb_gadget *gadget = cdev->gadget; - int gcnum, id, ret; + int id, ret; /* * Start disconnected. Userspace will connect the gadget once @@ -1156,15 +1156,6 @@ static int android_bind(struct usb_composite_dev *cdev) strings_dev[STRING_SERIAL_IDX].id = id; device_desc.iSerialNumber = id; - gcnum = usb_gadget_controller_number(gadget); - if (gcnum >= 0) - device_desc.bcdDevice = cpu_to_le16(0x0200 + gcnum); - else { - pr_warning("%s: controller '%s' not recognized\n", - longname, gadget->name); - device_desc.bcdDevice = __constant_cpu_to_le16(0x9999); - } - usb_gadget_set_selfpowered(gadget); dev->cdev = cdev; |