usb:composite:fix Provide function data when addressing device with only one interface
authorLukasz Majewski <l.majewski@samsung.com>
Fri, 1 Mar 2013 14:30:18 +0000 (15:30 +0100)
committerMarek Vasut <marex@denx.de>
Mon, 18 Mar 2013 17:58:52 +0000 (18:58 +0100)
This commit fixes problems with some non-standard requests send with
device address instead of interface address (bmRequestType.Receipent field).

This happens with dfu-util (debian version: 0.5), which address non standard
requests (like w_value=0x21 and bRequest=GET_DESCRIPTOR) to device.
Without this fix, the above request is STALLED, and hence causes dfu-util
to assume some standard configuration (packet size = 1024B instead of 4096B)
In turn it displays following errors:
Error obtaining DFU functional descriptor
Warning: Assuming DFU version 1.0
Warning: Transfer size can not be detected
...
Warning: Trying default transfer size 1024

This fix allows passing non-standard request to function setup code, where
it shall be handled.

Tested at:  Trats (exynos4210)
Tested with:DFU and UMS gadgets

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
drivers/usb/gadget/composite.c

index ebb5131a9cbd2786244184d05aa6fa4a77aade75..2c5600ed5210c9da2e2450132d11d1c65a41578e 100644 (file)
@@ -859,6 +859,25 @@ unknown:
                        if (&f->list == &cdev->config->functions)
                                f = NULL;
                        break;
+               /*
+                * dfu-util (version 0.5) sets bmRequestType.Receipent = Device
+                * for non-standard request (w_value = 0x21,
+                * bRequest = GET_DESCRIPTOR in this case).
+                * When only one interface is registered (as it is done now),
+                * then this request shall be handled as it was requested for
+                * interface.
+                *
+                * In the below code it is checked if only one interface is
+                * present and proper function for it is extracted. Due to that
+                * function's setup (f->setup) is called to handle this
+                * special non-standard request.
+                */
+               case USB_RECIP_DEVICE:
+                       debug("cdev->config->next_interface_id: %d intf: %d\n",
+                              cdev->config->next_interface_id, intf);
+                       if (cdev->config->next_interface_id == 1)
+                               f = cdev->config->interface[intf];
+                       break;
                }
 
                if (f && f->setup)