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

Commit befb2de1 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: move the initialization to reset_resume function 



Move tp->rtl_ops.init() from rtl8152_resume() to rtl8152_reset_resume().
The initialization is only necessary for reset_resume().

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49d10347

drivers/net/usb/r8152.c

+5 −4
Original line number Diff line number Diff line
@@ -3776,11 +3776,8 @@ static int rtl8152_resume(struct usb_interface *intf) 


	mutex_lock(&tp->control);



	if (!test_bit(SELECTIVE_SUSPEND, &tp->flags)) {

		tp->rtl_ops.init(tp);

		queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);

	if (!test_bit(SELECTIVE_SUSPEND, &tp->flags))

		netif_device_attach(netdev);

	}



	if (netif_running(netdev) && netdev->flags & IFF_UP) {

		if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {
@@ -3826,6 +3823,10 @@ static int rtl8152_reset_resume(struct usb_interface *intf) 
	struct r8152 *tp = usb_get_intfdata(intf);



	clear_bit(SELECTIVE_SUSPEND, &tp->flags);

	mutex_lock(&tp->control);

	tp->rtl_ops.init(tp);

	queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);

	mutex_unlock(&tp->control);

	return rtl8152_resume(intf);

}