diff options
| author | Lukasz Majewski <l.majewski@samsung.com> | 2013-10-08 14:30:41 +0200 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-10-20 23:42:41 +0200 |
| commit | d6eae7b0b172b3ef31a3f816ce946857f382ac4e (patch) | |
| tree | 475ac79d07aec27e7b54d21dca7fc915fb36bdee | |
| parent | 7b412ab31fe7957eabbfa86c131679fb244d7079 (diff) | |
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 <l.majewski@samsung.com>
Cc: Marek Vasut <marex@denx.de>
| -rw-r--r-- | board/siemens/common/factoryset.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/g_dnl.c | 4 | ||||
| -rw-r--r-- | 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 eda9141c54..fbe79973e3 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 1aaf78f519..98560b8abd 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 b6c4dd4ac3..de669fb85a 100644 --- a/include/g_dnl.h +++ b/include/g_dnl.h @@ -10,7 +10,7 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> -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); |