diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-08-18 11:23:21 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-08-18 11:23:21 +0200 |
| commit | db6394231e8f10d0d7677e3a239dc700ad4a8036 (patch) | |
| tree | 8954b4141a2694d50b27b2298fe155d5db5d7d96 /drivers/usb | |
| parent | 765d071a9869a47fa92fcfc9e842492b41ffeff8 (diff) | |
| parent | 47c66a2a28c5fc785f332cf7384c6303dd49dd54 (diff) | |
| download | barebox-db6394231e8f10d0d7677e3a239dc700ad4a8036.tar.gz barebox-db6394231e8f10d0d7677e3a239dc700ad4a8036.tar.xz | |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/multi.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/udc-core.c | 3 | ||||
| -rw-r--r-- | drivers/usb/musb/musb_gadget.c | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c index 445cc32420..95f5b90c88 100644 --- a/drivers/usb/gadget/multi.c +++ b/drivers/usb/gadget/multi.c @@ -179,8 +179,10 @@ static int multi_bind(struct usb_composite_dev *cdev) strings_dev[USB_GADGET_MANUFACTURER_IDX].s = gadget->manufacturer; strings_dev[USB_GADGET_PRODUCT_IDX].s = gadget->productname; + strings_dev[USB_GADGET_SERIAL_IDX].s = gadget->serialnumber; device_desc.iProduct = strings_dev[USB_GADGET_PRODUCT_IDX].id; + device_desc.iSerialNumber = strings_dev[USB_GADGET_SERIAL_IDX].id; config.label = strings_dev[STRING_DESCRIPTION_IDX].s; config.iConfiguration = strings_dev[STRING_DESCRIPTION_IDX].id; diff --git a/drivers/usb/gadget/udc-core.c b/drivers/usb/gadget/udc-core.c index 126d76e8bb..2516676f86 100644 --- a/drivers/usb/gadget/udc-core.c +++ b/drivers/usb/gadget/udc-core.c @@ -212,6 +212,9 @@ int usb_add_gadget_udc_release(struct device_d *parent, struct usb_gadget *gadge gadget->productname = xstrdup(barebox_get_model()); dev_add_param_string(&gadget->dev, "productname", NULL, NULL, &gadget->productname, NULL); + gadget->serialnumber = xstrdup(""); + dev_add_param_string(&gadget->dev, "serialnumber", NULL, NULL, + &gadget->serialnumber, NULL); dev_set_name(&udc->dev, "udc"); udc->dev.id = DEVICE_ID_DYNAMIC; diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index fc5cfb13f5..87f7e78e66 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -653,15 +653,6 @@ void musb_free_request(struct usb_ep *ep, struct usb_request *req) kfree(to_musb_request(req)); } -static LIST_HEAD(buffers); - -struct free_record { - struct list_head list; - struct device *dev; - unsigned bytes; - dma_addr_t dma; -}; - /* * Context: controller locked, IRQs blocked. */ |