aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.com>2016-05-02 07:06:14 -0400
committerDavid S. Miller <davem@davemloft.net>2016-05-03 15:49:34 -0400
commit2b84af94a3932b1dcb716d1898edb18b7325dbea (patch)
treeb5a2d1c2089f6bf084bb513de15b1bf34ce512c7 /drivers/net/usb
parentea0798423c60a1d34c75e5fedae009aee0a8de5f (diff)
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>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/r8152.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index d1f78c2c97aa..3f9f6ed3eec4 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3366,7 +3366,7 @@ static void r8153_init(struct r8152 *tp)
3366 ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data); 3366 ocp_write_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE, ocp_data);
3367 3367
3368 ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM; 3368 ocp_data = FIFO_EMPTY_1FB | ROK_EXIT_LPM;
3369 if (tp->version == RTL_VER_04 && tp->udev->speed != USB_SPEED_SUPER) 3369 if (tp->version == RTL_VER_04 && tp->udev->speed < USB_SPEED_SUPER)
3370 ocp_data |= LPM_TIMER_500MS; 3370 ocp_data |= LPM_TIMER_500MS;
3371 else 3371 else
3372 ocp_data |= LPM_TIMER_500US; 3372 ocp_data |= LPM_TIMER_500US;
@@ -4211,6 +4211,7 @@ static int rtl8152_probe(struct usb_interface *intf,
4211 4211
4212 switch (udev->speed) { 4212 switch (udev->speed) {
4213 case USB_SPEED_SUPER: 4213 case USB_SPEED_SUPER:
4214 case USB_SPEED_SUPER_PLUS:
4214 tp->coalesce = COALESCE_SUPER; 4215 tp->coalesce = COALESCE_SUPER;
4215 break; 4216 break;
4216 case USB_SPEED_HIGH: 4217 case USB_SPEED_HIGH: