summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <[email protected]>2015-01-09 14:54:56 +0100
committerMarek Vasut <[email protected]>2015-01-18 12:31:00 +0100
commit1fd81b7c23705eb46fd80d1eccb68fa8697cf348 (patch)
treecb1d853520ca34b700e89742381f2f483150a4be
parent87ed6b1067a8b8cf2bf3fd900080164cef8e0b77 (diff)
usb: gadget: f_dfu: Add get_alt function to pass the USB compliance test
Without this function the USB compliance test (USB 2.0 Command Verifier) will fail in the "Interface Descriptor Test" with this error message: FAIL (1.2.51) A successful GetInterface request must return the alternate setting set by a prior call to SetInterface. Lets add this function to read back the value so that the DFU device fully passes the USB compliance test. Signed-off-by: Stefan Roese <[email protected]> Cc: Roger Meier <[email protected]> Cc: Samuel Egli <[email protected]> Cc: Enrico Leto <[email protected]> Acked-by: Heiko Schocher <[email protected]> Cc: Lukasz Majewski <[email protected]> Cc: Marek Vasut <[email protected]>
-rw-r--r--drivers/usb/gadget/f_dfu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_dfu.c b/drivers/usb/gadget/f_dfu.c
index ead71eba6b1..77a1567a944 100644
--- a/drivers/usb/gadget/f_dfu.c
+++ b/drivers/usb/gadget/f_dfu.c
@@ -780,6 +780,13 @@ static int dfu_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
return 0;
}
+static int __dfu_get_alt(struct usb_function *f, unsigned intf)
+{
+ struct f_dfu *f_dfu = func_to_dfu(f);
+
+ return f_dfu->altsetting;
+}
+
/* TODO: is this really what we need here? */
static void dfu_disable(struct usb_function *f)
{
@@ -806,6 +813,7 @@ static int dfu_bind_config(struct usb_configuration *c)
f_dfu->usb_function.bind = dfu_bind;
f_dfu->usb_function.unbind = dfu_unbind;
f_dfu->usb_function.set_alt = dfu_set_alt;
+ f_dfu->usb_function.get_alt = __dfu_get_alt;
f_dfu->usb_function.disable = dfu_disable;
f_dfu->usb_function.strings = dfu_generic_strings;
f_dfu->usb_function.setup = dfu_handle;