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

Commit 49d4b141 authored by Hayes Wang's avatar Hayes Wang Committed by David S. Miller
Browse files

Revert "r8152: napi hangup fix after disconnect" 



This reverts commit 0ee1f473.

The commit 0ee1f473 ("r8152: napi hangup fix after
disconnect") adds a check about RTL8152_UNPLUG to determine
if calling napi_disable() is invalid in rtl8152_close(),
when rtl8152_disconnect() is called. This avoids to use
napi_disable() after calling netif_napi_del().

Howver, commit ffa9fec3 ("r8152: set RTL8152_UNPLUG
only for real disconnection") causes that RTL8152_UNPLUG
is not always set when calling rtl8152_disconnect().
Therefore, I have to revert commit 0ee1f473 ("r8152:
napi hangup fix after disconnect"), first. And submit
another patch to fix it.

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

drivers/net/usb/r8152.c

+1 −2
Original line number Diff line number Diff line
@@ -4021,7 +4021,6 @@ static int rtl8152_close(struct net_device *netdev) 
#ifdef CONFIG_PM_SLEEP

	unregister_pm_notifier(&tp->pm_notifier);

#endif

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

	napi_disable(&tp->napi);

	clear_bit(WORK_ENABLE, &tp->flags);

	usb_kill_urb(tp->intr_urb);