summaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/catc.c
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-09 14:26:01 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-09 14:26:01 -0700
commit8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch)
treee323eda3b7ed55a5398751021e8031c1cae56f9d /drivers/usb/net/catc.c
parent20dd026d7f5a6972dc78b4928a99620001fa547d (diff)
parent5dce225bd9ea60e28e17076de63df0dee51b2883 (diff)
downloadkernel-crypto-8ccc457722ba226ea72fca6f9ba3b54535d4749e.tar.gz
kernel-crypto-8ccc457722ba226ea72fca6f9ba3b54535d4749e.tar.xz
kernel-crypto-8ccc457722ba226ea72fca6f9ba3b54535d4749e.zip
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/usb/net/catc.c')
-rw-r--r--drivers/usb/net/catc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index c8be912f24e..37ef365a247 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -383,7 +383,6 @@ static void catc_tx_done(struct urb *urb, struct pt_regs *regs)
if (urb->status == -ECONNRESET) {
dbg("Tx Reset.");
- urb->transfer_flags &= ~URB_ASYNC_UNLINK;
urb->status = 0;
catc->netdev->trans_start = jiffies;
catc->stats.tx_errors++;
@@ -445,7 +444,6 @@ static void catc_tx_timeout(struct net_device *netdev)
struct catc *catc = netdev_priv(netdev);
warn("Transmit timed out.");
- catc->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
usb_unlink_urb(catc->tx_urb);
}