From 28f38d576395436d932b7b6d1cfd4754ab6c7dcc Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 25 Feb 2010 20:18:13 +0100 Subject: [PATCH] --- yaml --- r: 185427 b: refs/heads/master c: 04b922c41710d770460c4663f69eabb0bf670be9 h: refs/heads/master i: 185425: 244d07e3bfc3249859cb6a3bbcd9a8a6f608b2ba 185423: 24f82b90405e50876af87f63d393cfc12ffa3178 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8339186415fc..e2788d34d4d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 019ccc73201e933fe7d8119c90a812d347e325f9 +refs/heads/master: 04b922c41710d770460c4663f69eabb0bf670be9 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 96686471472d..9594e357a914 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -88,7 +88,6 @@ struct ftdi_private { unsigned int latency; /* latency setting in use */ spinlock_t tx_lock; /* spinlock for transmit state */ - unsigned long tx_bytes; unsigned long tx_outstanding_bytes; unsigned long tx_outstanding_urbs; unsigned short max_packet_size; @@ -1729,10 +1728,6 @@ static int ftdi_open(struct tty_struct *tty, struct usb_serial_port *port) dbg("%s", __func__); - spin_lock_irqsave(&priv->tx_lock, flags); - priv->tx_bytes = 0; - spin_unlock_irqrestore(&priv->tx_lock, flags); - write_latency_timer(port); /* No error checking for this (will get errors later anyway) */ @@ -1917,7 +1912,6 @@ static int ftdi_write(struct tty_struct *tty, struct usb_serial_port *port, } else { spin_lock_irqsave(&priv->tx_lock, flags); priv->tx_outstanding_bytes += count; - priv->tx_bytes += count; spin_unlock_irqrestore(&priv->tx_lock, flags); }