Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26a581fa authored by Hayes Wang's avatar Hayes Wang Committed by Greg Kroah-Hartman
Browse files

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: 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 281f32e3

drivers/net/usb/r8152.c

+5 −4
Original line number Diff line number Diff line
@@ -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