diff options
| author | Hayes Wang <hayeswang@realtek.com> | 2020-01-22 11:02:07 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-23 13:20:57 +0300 |
| commit | 9583a3638dc07cc1878f41265e85ed497f72efcb (patch) | |
| tree | f54ffc89ad1f511d843c74f97432de40e0fe011c /drivers/net/usb | |
| parent | f99cd20eda12b1920ffc284a736437c016b3a5a2 (diff) | |
| download | linux-9583a3638dc07cc1878f41265e85ed497f72efcb.tar.xz | |
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: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -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 504db2348a3e..c3217a5c2fe1 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -6739,6 +6739,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); #if IS_BUILTIN(CONFIG_USB_RTL8152) /* Retry in case request_firmware() is not ready yet. */ @@ -6756,10 +6761,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 |