Merge 5.8-rc3 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jun 2020 06:22:27 +0000 (08:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jun 2020 06:22:27 +0000 (08:22 +0200)
We want the USB fixes in here, and this resolves a merge issue found in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/cdns3/ep0.c
drivers/usb/core/quirks.c
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/mv_udc_core.c

@@@ -327,11 -327,12 +327,12 @@@ static int cdns3_ep0_feature_handle_dev
                if (!set || (tmode & 0xff) != 0)
                        return -EINVAL;
  
-               switch (tmode >> 8) {
+               tmode >>= 8;
+               switch (tmode) {
 -              case TEST_J:
 -              case TEST_K:
 -              case TEST_SE0_NAK:
 -              case TEST_PACKET:
 +              case USB_TEST_J:
 +              case USB_TEST_K:
 +              case USB_TEST_SE0_NAK:
 +              case USB_TEST_PACKET:
                        cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
                                               USB_CMD_STMODE |
                                               USB_STS_TMODE_SEL(tmode - 1));
Simple merge
Simple merge
Simple merge