From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Jun 2020 06:22:27 +0000 (+0200)
Subject: Merge 5.8-rc3 into usb-next
X-Git-Tag: v5.10.7~1952^2~209
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cf6ffae380061b16b2b4269d4f2e1a50aa2508a;p=platform%2Fkernel%2Flinux-rpi.git

Merge 5.8-rc3 into usb-next

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>
---

9cf6ffae380061b16b2b4269d4f2e1a50aa2508a
diff --cc drivers/usb/cdns3/ep0.c
index 04a522f,61ec5bb..4bca730
--- a/drivers/usb/cdns3/ep0.c
+++ b/drivers/usb/cdns3/ep0.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));