lkml.org 
[lkml]   [2015]   [Nov]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/23] usb: gadget: composite: handle get_alt() automatically
    Date
    As now we store current altsetting number for each interface, we can
    handle USB_REQ_GET_INTERFACE automatically.

    Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
    ---
    drivers/usb/gadget/composite.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
    index 5ce95d2..21f8c51 100644
    --- a/drivers/usb/gadget/composite.c
    +++ b/drivers/usb/gadget/composite.c
    @@ -2075,7 +2075,13 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
    if (!f)
    break;
    /* lots of interfaces only need altsetting zero... */
    - value = f->get_alt ? f->get_alt(f, w_index) : 0;
    + if (usb_function_is_new_api(f)) {
    + value = usb_interface_id_to_index(f, intf);
    + if (value >= 0)
    + value = f->descs->intfs[value]->cur_altset;
    + } else {
    + value = f->get_alt ? f->get_alt(f, w_index) : 0;
    + }
    if (value < 0)
    break;
    *((u8 *)req->buf) = value;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-11-03 14:01    [W:4.149 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site