Title: [5336] branches/2007R1/drivers/serial/bfin_5xx.c: Fix bug[#4436]
- Revision
- 5336
- Author
- sonicz
- Date
- 2008-09-25 01:38:44 -0500 (Thu, 25 Sep 2008)
Log Message
Fix bug[#4436]
Modified Paths
Diff
Modified: branches/2007R1/drivers/serial/bfin_5xx.c (5335 => 5336)
--- branches/2007R1/drivers/serial/bfin_5xx.c 2008-09-25 06:32:47 UTC (rev 5335)
+++ branches/2007R1/drivers/serial/bfin_5xx.c 2008-09-25 06:38:44 UTC (rev 5336)
@@ -86,7 +86,9 @@
static void bfin_serial_stop_tx(struct uart_port *port)
{
struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+#ifdef CONFIG_SERIAL_BFIN_DMA
struct circ_buf *xmit = &uart->port.info->xmit;
+#endif
#ifdef CONFIG_SERIAL_BFIN_DMA
disable_dma(uart->tx_dma_channel);
@@ -109,6 +111,7 @@
static void bfin_serial_start_tx(struct uart_port *port)
{
struct bfin_serial_port *uart = (struct bfin_serial_port *)port;
+ int flags;
#ifdef CONFIG_SERIAL_BFIN_DMA
if (uart->tx_done)
@@ -377,6 +380,7 @@
}
#endif
+ spin_lock_irqsave(&uart->port.lock, flags);
#ifdef CONFIG_SERIAL_BFIN_DMA
static void bfin_serial_dma_tx_chars(struct bfin_serial_port *uart)
{
@@ -488,8 +492,8 @@
uart->rx_dma_buf.head = uart->rx_dma_buf.tail;
}
spin_unlock_irqrestore(&uart->port.lock, flags);
- uart->rx_dma_timer.expires = jiffies + DMA_RX_FLUSH_JIFFIES;
- add_timer(&(uart->rx_dma_timer));
+
+ mod_timer(&(uart->rx_dma_timer), jiffies + DMA_RX_FLUSH_JIFFIES);
}
static irqreturn_t bfin_serial_dma_tx_int(int irq, void *dev_id)
@@ -524,6 +528,8 @@
struct bfin_serial_port *uart = dev_id;
unsigned short irqstat;
+ spin_lock(&uart->port.lock);
+
uart->rx_dma_nrows++;
if (uart->rx_dma_nrows == DMA_RX_YCOUNT) {
uart->rx_dma_nrows = 0;
@@ -531,7 +537,6 @@
bfin_serial_dma_rx_chars(uart);
uart->rx_dma_buf.head = uart->rx_dma_buf.tail = 0;
}
- spin_lock(&uart->port.lock);
irqstat = get_dma_curr_irqstat(uart->rx_dma_channel);
clear_dma_irqstat(uart->rx_dma_channel);
@@ -581,6 +586,7 @@
else
gpio_set_value(uart->rts_pin, 1);
#endif
+ spin_unlock_irqrestore(&uart->port.lock, flags);
}
/*
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
