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

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

r8152: fix the submission of the interrupt transfer 



The submission of the interrupt transfer should be done after setting
the bit of WORK_ENABLE, otherwise the callback function would have
the opportunity to be returned directly.

Clear the bit of WORK_ENABLE before killing the interrupt transfer.

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

drivers/net/usb/r8152.c

+8 −9
Original line number Diff line number Diff line
@@ -2273,22 +2273,21 @@ static int rtl8152_open(struct net_device *netdev) 
	struct r8152 *tp = netdev_priv(netdev);

	int res = 0;



	rtl8152_set_speed(tp, AUTONEG_ENABLE,

			  tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,

			  DUPLEX_FULL);

	tp->speed = 0;

	netif_carrier_off(netdev);

	netif_start_queue(netdev);

	set_bit(WORK_ENABLE, &tp->flags);

	res = usb_submit_urb(tp->intr_urb, GFP_KERNEL);

	if (res) {

		if (res == -ENODEV)

			netif_device_detach(tp->netdev);

		netif_warn(tp, ifup, netdev, "intr_urb submit failed: %d\n",

			   res);

		return res;

	}



	rtl8152_set_speed(tp, AUTONEG_ENABLE,

			  tp->mii.supports_gmii ? SPEED_1000 : SPEED_100,

			  DUPLEX_FULL);

	tp->speed = 0;

	netif_carrier_off(netdev);

	netif_start_queue(netdev);

	set_bit(WORK_ENABLE, &tp->flags);



	return res;

}
@@ -2298,8 +2297,8 @@ static int rtl8152_close(struct net_device *netdev) 
	struct r8152 *tp = netdev_priv(netdev);

	int res = 0;



	usb_kill_urb(tp->intr_urb);

	clear_bit(WORK_ENABLE, &tp->flags);

	usb_kill_urb(tp->intr_urb);

	cancel_delayed_work_sync(&tp->schedule);

	netif_stop_queue(netdev);

	tasklet_disable(&tp->tl);