diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:21:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:21:02 -0400 |
| commit | 54205209732a05f51f5fbb3eb3e5c36ac81e79d9 (patch) | |
| tree | 4992850c7d5d5ed4034cbd4fe5f5ea23aeff317e /drivers/usb/net/rtl8150.c | |
| parent | 6d8de3a26b5c20b04a9317b4446582167d5883da (diff) | |
| parent | b71e318cdb1dc301d734fdd4983dfc6dc167235a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
| -rw-r--r-- | drivers/usb/net/rtl8150.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 59ab40ebb394..c3d4e3589e30 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
| @@ -653,7 +653,6 @@ static void rtl8150_tx_timeout(struct net_device *netdev) | |||
| 653 | { | 653 | { |
| 654 | rtl8150_t *dev = netdev_priv(netdev); | 654 | rtl8150_t *dev = netdev_priv(netdev); |
| 655 | warn("%s: Tx timeout.", netdev->name); | 655 | warn("%s: Tx timeout.", netdev->name); |
| 656 | dev->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 657 | usb_unlink_urb(dev->tx_urb); | 656 | usb_unlink_urb(dev->tx_urb); |
| 658 | dev->stats.tx_errors++; | 657 | dev->stats.tx_errors++; |
| 659 | } | 658 | } |