Ping ...
On Sun, Feb 6, 2011 at 6:47 PM, Jassi Brar <jassisinghbrar@xxxxxxxxx> wrote:
> From: Jassi Brar <jassi.brar@xxxxxxxxxxx>
>
> Reorder the driver->name assignment so the 'iProduct' could be initialized
> as well if both 'name' and 'iProduct' come as NULL by default.
>
> Also, remove the misplaced 'extern' keyword.
>
> Signed-off-by: Jassi Brar <jassi.brar@xxxxxxxxxxx>
> ---
> Âdrivers/usb/gadget/composite.c | Â Â6 +++---
> Â1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
> index 1ba4bef..92bb61a 100644
> --- a/drivers/usb/gadget/composite.c
> +++ b/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;
> --
> 1.7.0.1
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
