diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-04 08:41:09 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-04 08:41:09 +0300 |
commit | 16c8373ecf7b3c723a8e765d798ea413bc8345a6 (patch) | |
tree | 19684614078313ac940ce1ad744772dac71b91a6 /drivers/usb/renesas_usbhs | |
parent | d19f1d44e74322ae2a75dc07b7d44fecacd5bcfb (diff) | |
parent | a99d8080aaf358d5d23581244e5da23b35e340b9 (diff) | |
download | linux-16c8373ecf7b3c723a8e765d798ea413bc8345a6.tar.xz |
Merge 5.4-rc6 into usb-next
We need the USB fixes in here to build on top of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/renesas_usbhs')
-rw-r--r-- | drivers/usb/renesas_usbhs/mod_gadget.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c index 72eda9f926fe..53489cafecc1 100644 --- a/drivers/usb/renesas_usbhs/mod_gadget.c +++ b/drivers/usb/renesas_usbhs/mod_gadget.c @@ -265,7 +265,7 @@ static int usbhsg_recip_handler_std_set_device(struct usbhs_priv *priv, case USB_DEVICE_TEST_MODE: usbhsg_recip_handler_std_control_done(priv, uep, ctrl); udelay(100); - usbhs_sys_set_test_mode(priv, le16_to_cpu(ctrl->wIndex >> 8)); + usbhs_sys_set_test_mode(priv, le16_to_cpu(ctrl->wIndex) >> 8); break; default: usbhsg_recip_handler_std_control_done(priv, uep, ctrl); |