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

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

r8152: clear SELECTIVE_SUSPEND when autoresuming 



The flag of SELECTIVE_SUSPEND should be cleared when autoresuming.
Otherwise, when the system suspend and resume occur, it may have
the wrong flow.

Besides, because the flag of SELECTIVE_SUSPEND couldn't be used
to check if the hw enables the relative feature, it should alwayes
be disabled in close().

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

drivers/net/usb/r8152.c

+3 −4
Original line number Diff line number Diff line
@@ -2955,10 +2955,7 @@ static int rtl8152_close(struct net_device *netdev) 
		 * be disable when autoresume occurs, because the

		 * netif_running() would be false.

		 */

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

		rtl_runtime_suspend_enable(tp, false);

			clear_bit(SELECTIVE_SUSPEND, &tp->flags);

		}



		tasklet_disable(&tp->tl);

		tp->rtl_ops.down(tp);
@@ -3253,6 +3250,8 @@ static int rtl8152_resume(struct usb_interface *intf) 
			set_bit(WORK_ENABLE, &tp->flags);

		}

		usb_submit_urb(tp->intr_urb, GFP_KERNEL);

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

		clear_bit(SELECTIVE_SUSPEND, &tp->flags);

	}



	mutex_unlock(&tp->control);