From d6eae7b0b172b3ef31a3f816ce946857f382ac4e Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Tue, 8 Oct 2013 14:30:41 +0200 Subject: [PATCH] usb:g_dnl: Add name parameter to g_dnl_bind_fixup function New parameter, namely *name has been added to g_dnl_bind_fixup(). It is necessary (for compatibility reasons) to assign new USB idProduct and idVendor for different usb functions. Signed-off-by: Lukasz Majewski Cc: Marek Vasut --- board/siemens/common/factoryset.c | 2 +- drivers/usb/gadget/g_dnl.c | 4 ++-- include/g_dnl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index eda9141..fbe7997 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -275,7 +275,7 @@ int factoryset_setenv(void) return ret; } -int g_dnl_bind_fixup(struct usb_device_descriptor *dev) +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { put_unaligned(factory_dat.usb_vendor_id, &dev->idVendor); put_unaligned(factory_dat.usb_product_id, &dev->idProduct); diff --git a/drivers/usb/gadget/g_dnl.c b/drivers/usb/gadget/g_dnl.c index 1aaf78f..98560b8 100644 --- a/drivers/usb/gadget/g_dnl.c +++ b/drivers/usb/gadget/g_dnl.c @@ -126,7 +126,7 @@ static int g_dnl_config_register(struct usb_composite_dev *cdev) } __weak -int g_dnl_bind_fixup(struct usb_device_descriptor *dev) +int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) { return 0; } @@ -153,7 +153,7 @@ static int g_dnl_bind(struct usb_composite_dev *cdev) g_dnl_string_defs[1].id = id; device_desc.iProduct = id; - g_dnl_bind_fixup(&device_desc); + g_dnl_bind_fixup(&device_desc, cdev->driver->name); ret = g_dnl_config_register(cdev); if (ret) goto error; diff --git a/include/g_dnl.h b/include/g_dnl.h index b6c4dd4..de669fb 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,7 +10,7 @@ #include #include -int g_dnl_bind_fixup(struct usb_device_descriptor *); +int g_dnl_bind_fixup(struct usb_device_descriptor *, const char *); int g_dnl_register(const char *s); void g_dnl_unregister(void); -- 1.9.1