diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 08:49:38 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 08:49:38 +0400 |
| commit | e9dd2561793c05d70c9df1bc16a2dde6f23388df (patch) | |
| tree | 20099972569cc0748133a6351600fff9cbb15f4a /drivers/serial/serial_txx9.c | |
| parent | d011e151bc5d1a581bf35b492a4fde44d30382b9 (diff) | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| download | linux-e9dd2561793c05d70c9df1bc16a2dde6f23388df.tar.xz | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/serial/serial_txx9.c')
| -rw-r--r-- | drivers/serial/serial_txx9.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c index 3f1051a4a13f..d085030df70b 100644 --- a/drivers/serial/serial_txx9.c +++ b/drivers/serial/serial_txx9.c @@ -442,13 +442,10 @@ static unsigned int serial_txx9_tx_empty(struct uart_port *port) static unsigned int serial_txx9_get_mctrl(struct uart_port *port) { struct uart_txx9_port *up = (struct uart_txx9_port *)port; - unsigned long flags; unsigned int ret; - spin_lock_irqsave(&up->port.lock, flags); ret = ((sio_in(up, TXX9_SIFLCR) & TXX9_SIFLCR_RTSSC) ? 0 : TIOCM_RTS) | ((sio_in(up, TXX9_SICISR) & TXX9_SICISR_CTSS) ? 0 : TIOCM_CTS); - spin_unlock_irqrestore(&up->port.lock, flags); return ret; } |