DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: gadget: android: fix compilation on 2.6.37

Browse Source 
Change-Id: I9a99f007415c5be1bd1a86b138486eac51784e0d
Signed-off-by: Dima Zavin <dima@android.com>
This commit is contained in:
Dima Zavin
2011-01-05 16:13:41 -08:00
committed by Colin Cross
parent e6be8941f4
commit 8da0417ce4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/usb/gadget/android.c
View File

@@ -200,7 +200,6 @@ static int android_setup_config(struct usb_configuration *c,
static struct usb_configuration android_config_driver = {
.label = "android",
.bind = android_bind_config,
.setup = android_setup_config,
.bConfigurationValue = 1,
.bmAttributes = USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
@@ -301,7 +300,7 @@ static int android_bind(struct usb_composite_dev *cdev)
device_desc.iSerialNumber = id;
/* register our configuration */
ret = usb_add_config(cdev, &android_config_driver);
ret = usb_add_config(cdev, &android_config_driver, android_bind_config);
if (ret) {
printk(KERN_ERR "usb_add_config failed\n");
return ret;
@@ -336,7 +335,6 @@ static struct usb_composite_driver android_usb_driver = {
.name = "android_usb",
.dev = &device_desc,
.strings = dev_strings,
.bind = android_bind,
.enable_function = android_enable_function,
};
@@ -458,7 +456,7 @@ static int android_probe(struct platform_device *pdev)
strings_dev[STRING_SERIAL_IDX].s = pdata->serial_number;
}
return usb_composite_register(&android_usb_driver);
return usb_composite_probe(&android_usb_driver, android_bind);
}
static struct platform_driver android_platform_driver = {