Эх сурвалжийг харах

rtl8152: correct speed testing

Allow for SS+ USB

Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Oliver Neukum 9 жил өмнө
parent
commit
2b84af94a3

+ 2 - 1
drivers/net/usb/r8152.c

@@ -3366,7 +3366,7 @@ static void r8153_init(struct r8152 *tp)
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
 	ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
 
 
 	ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM;
 	ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM;
-	if (tp->version == RTL_VER_04 && tp->udev->speed != USB_SPEED_SUPER)
+	if (tp->version == RTL_VER_04 && tp->udev->speed < USB_SPEED_SUPER)
 		ocp_data |= LPM_TIMER_500MS;
 		ocp_data |= LPM_TIMER_500MS;
 	else
 	else
 		ocp_data |= LPM_TIMER_500US;
 		ocp_data |= LPM_TIMER_500US;
@@ -4211,6 +4211,7 @@ static int rtl8152_probe(struct usb_interface *intf,
 
 
 	switch (udev->speed) {
 	switch (udev->speed) {
 	case USB_SPEED_SUPER:
 	case USB_SPEED_SUPER:
+	case USB_SPEED_SUPER_PLUS:
 		tp->coalesce = COALESCE_SUPER;
 		tp->coalesce = COALESCE_SUPER;
 		break;
 		break;
 	case USB_SPEED_HIGH:
 	case USB_SPEED_HIGH: