1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index dedd9ab06d82..26953bfa6922 100644
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -116,11 +116,20 @@ static void bfin_serial_set_mctrl(struct uart_port *port, unsigned int mctrl)
 static irqreturn_t bfin_serial_mctrl_cts_int(int irq, void *dev_id)
 {
         struct bfin_serial_port *uart = dev_id;
-        unsigned int status;
-
-        status = bfin_serial_get_mctrl(&uart->port);
+        unsigned int status = bfin_serial_get_mctrl(&uart->port);
 #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS
+        struct tty_struct *tty = uart->port.state->port.tty;
+
         UART_CLEAR_SCTS(uart);
+        if (tty->hw_stopped) {
+                if (status) {
+                        tty->hw_stopped = 0;
+                        uart_write_wakeup(&uart->port);
+                }
+        } else {
+                if (!status)
+                        tty->hw_stopped = 1;
+        }
 #endif
         uart_handle_cts_change(&uart->port, status & TIOCM_CTS);
 
@@ -1358,7 +1367,9 @@ static int bfin_serial_probe(struct platform_device *pdev)
                         uart->cts_pin = -1;
                 else {
                         uart->cts_pin = res->start;
+#ifdef CONFIG_SERIAL_BFIN_CTSRTS
                         uart->port.flags |= ASYNC_CTS_FLOW;
+#endif
                 }
 
                 res = platform_get_resource(pdev, IORESOURCE_IO, 1);