Commit 9583a363 authored by Hayes Wang's avatar Hayes Wang Committed by David S. Miller

r8152: get default setting of WOL before initializing

Initailization would reset runtime suspend by tp->saved_wolopts, so
the tp->saved_wolopts should be set before initializing.
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f99cd20e
...@@ -6739,6 +6739,11 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -6739,6 +6739,11 @@ static int rtl8152_probe(struct usb_interface *intf,
intf->needs_remote_wakeup = 1; intf->needs_remote_wakeup = 1;
if (!rtl_can_wakeup(tp))
__rtl_set_wol(tp, 0);
else
tp->saved_wolopts = __rtl_get_wol(tp);
tp->rtl_ops.init(tp); tp->rtl_ops.init(tp);
#if IS_BUILTIN(CONFIG_USB_RTL8152) #if IS_BUILTIN(CONFIG_USB_RTL8152)
/* Retry in case request_firmware() is not ready yet. */ /* Retry in case request_firmware() is not ready yet. */
...@@ -6756,10 +6761,6 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -6756,10 +6761,6 @@ static int rtl8152_probe(struct usb_interface *intf,
goto out1; goto out1;
} }
if (!rtl_can_wakeup(tp))
__rtl_set_wol(tp, 0);
tp->saved_wolopts = __rtl_get_wol(tp);
if (tp->saved_wolopts) if (tp->saved_wolopts)
device_set_wakeup_enable(&udev->dev, true); device_set_wakeup_enable(&udev->dev, true);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment