From c54b2451b02c885fbd31194882a6b973293327f5 Mon Sep 17 00:00:00 2001 From: Jassi Brar Date: Sun, 6 Feb 2011 18:47:18 +0900 Subject: [PATCH] --- yaml --- r: 235306 b: refs/heads/master c: 05c3eebd50ad831c462ec264f82a87654d0ee974 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/composite.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fd40a7ef4b88..c4cf6ba5061a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff085de758ebcb2309dd013fecb7cbb3cb6c7a43 +refs/heads/master: 05c3eebd50ad831c462ec264f82a87654d0ee974 diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c index bbbbfb707504..53e0496c71b5 100644 --- a/trunk/drivers/usb/gadget/composite.c +++ b/trunk/drivers/usb/gadget/composite.c @@ -1258,16 +1258,16 @@ static struct usb_gadget_driver composite_driver = { * while it was binding. That would usually be done in order to wait for * some userspace participation. */ -extern int usb_composite_probe(struct usb_composite_driver *driver, +int usb_composite_probe(struct usb_composite_driver *driver, int (*bind)(struct usb_composite_dev *cdev)) { if (!driver || !driver->dev || !bind || composite) return -EINVAL; - if (!driver->iProduct) - driver->iProduct = driver->name; if (!driver->name) driver->name = "composite"; + if (!driver->iProduct) + driver->iProduct = driver->name; composite_driver.function = (char *) driver->name; composite_driver.driver.name = driver->name; composite = driver;