From b32c19290c19ddae986e3439fa4258900d930a74 Mon Sep 17 00:00:00 2001 From: Ido Shayevitz Date: Sun, 24 Jun 2012 13:27:41 +0300 Subject: [PATCH] usb: gadget: android: Set usb_core_id if exists Read usb_core_id from platfrom data. Change-Id: I360bc064c173214c3e1381dac47eec10f3285819 Signed-off-by: Ido Shayevitz --- drivers/usb/gadget/android.c | 3 +++ include/linux/usb/android.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 029955d608b..43a2aef7200 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1812,6 +1812,9 @@ static int __devinit android_probe(struct platform_device *pdev) goto err_dev; } + if (pdata) + composite_driver.usb_core_id = pdata->usb_core_id; + ret = usb_composite_probe(&android_usb_driver, android_bind); if (ret) { pr_err("%s(): Failed to register android " diff --git a/include/linux/usb/android.h b/include/linux/usb/android.h index 6d3c3ad2c1f..bf65ebb2560 100644 --- a/include/linux/usb/android.h +++ b/include/linux/usb/android.h @@ -20,6 +20,7 @@ struct android_usb_platform_data { int (*update_pid_and_serial_num)(uint32_t, const char *); u32 swfi_latency; + u8 usb_core_id; }; #endif /* __LINUX_USB_ANDROID_H */