Commit 97f0fcaf authored by Hayes Wang's avatar Hayes Wang Committed by Greg Kroah-Hartman

r8152: get default setting of WOL before initializing

[ Upstream commit 9583a363 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c82866b2
...@@ -5259,6 +5259,11 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -5259,6 +5259,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);
queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0); queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);
set_ethernet_addr(tp); set_ethernet_addr(tp);
...@@ -5272,10 +5277,6 @@ static int rtl8152_probe(struct usb_interface *intf, ...@@ -5272,10 +5277,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