diff options
| author | Hayes Wang <hayeswang@realtek.com> | 2020-01-22 16:02:07 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-02-05 14:18:25 +0000 |
| commit | ce9ba09d135bb93652811783bce421be074fa5e4 (patch) | |
| tree | a4a2731f7194e8a6fd1f2f1da8e6c29cf2dfd6ee | |
| parent | 6f0f284b770a29d0094b4671e37ac0ee521903b6 (diff) | |
| download | linux-stable-ce9ba09d135bb93652811783bce421be074fa5e4.tar.gz linux-stable-ce9ba09d135bb93652811783bce421be074fa5e4.tar.bz2 linux-stable-ce9ba09d135bb93652811783bce421be074fa5e4.zip | |
r8152: get default setting of WOL before initializing
[ Upstream commit 9583a3638dc07cc1878f41265e85ed497f72efcb ]
Initailization would reset runtime suspend by tp->saved_wolopts, so
the tp->saved_wolopts should be set before initializing.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/usb/r8152.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 0083c60f5cdf..a7f9c1886bd4 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5244,6 +5244,11 @@ static int rtl8152_probe(struct usb_interface *intf, 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); queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0); set_ethernet_addr(tp); @@ -5257,10 +5262,6 @@ static int rtl8152_probe(struct usb_interface *intf, goto out1; } - if (!rtl_can_wakeup(tp)) - __rtl_set_wol(tp, 0); - - tp->saved_wolopts = __rtl_get_wol(tp); if (tp->saved_wolopts) device_set_wakeup_enable(&udev->dev, true); else |