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 21:22:49 +0000 |
| commit | 26a581fafceb7cddbabd9d08e679dc3b9d13578d (patch) | |
| tree | 67a8d9b05c3056e1afb656c1485f47f65370d7da | |
| parent | 281f32e343826e871a4cb795020335da263b22fc (diff) | |
| download | linux-26a581fafceb7cddbabd9d08e679dc3b9d13578d.tar.gz linux-26a581fafceb7cddbabd9d08e679dc3b9d13578d.tar.bz2 linux-26a581fafceb7cddbabd9d08e679dc3b9d13578d.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 9e4b7a400284..df993a1c60c0 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5690,6 +5690,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); @@ -5703,10 +5708,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 |