lkml.org 
[lkml]   [2020]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 33/78] can: gs_usb: gs_usb_probe(): use descriptors of current altsetting
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 2f361cd9474ab2c4ab9ac8db20faf81e66c6279b upstream.

    Make sure to always use the descriptors of the current alternate setting
    to avoid future issues when accessing fields that may differ between
    settings.

    Signed-off-by: Johan Hovold <johan@kernel.org>
    Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices")
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/usb/gs_usb.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/can/usb/gs_usb.c
    +++ b/drivers/net/can/usb/gs_usb.c
    @@ -918,7 +918,7 @@ static int gs_usb_probe(struct usb_inter
    GS_USB_BREQ_HOST_FORMAT,
    USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
    1,
    - intf->altsetting[0].desc.bInterfaceNumber,
    + intf->cur_altsetting->desc.bInterfaceNumber,
    hconf,
    sizeof(*hconf),
    1000);
    @@ -941,7 +941,7 @@ static int gs_usb_probe(struct usb_inter
    GS_USB_BREQ_DEVICE_CONFIG,
    USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
    1,
    - intf->altsetting[0].desc.bInterfaceNumber,
    + intf->cur_altsetting->desc.bInterfaceNumber,
    dconf,
    sizeof(*dconf),
    1000);

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