diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2011-12-12 23:22:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-13 12:50:15 -0500 |
commit | b48dc711c33034958768fadf15f75abff95fb499 (patch) | |
tree | 30837be79b5dc93cbf186246fc6ca7478bf1b831 /drivers/tty | |
parent | 5c2f37dddd963df61aed14283adb98067fb6afe5 (diff) |
serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/bfin_uart.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index abac23741057..dedd9ab06d82 100644 --- a/drivers/tty/serial/bfin_uart.c +++ b/drivers/tty/serial/bfin_uart.c | |||
@@ -726,16 +726,17 @@ static int bfin_serial_startup(struct uart_port *port) | |||
726 | } | 726 | } |
727 | #endif | 727 | #endif |
728 | #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS | 728 | #ifdef CONFIG_SERIAL_BFIN_HARD_CTSRTS |
729 | if (uart->cts_pin >= 0 && request_irq(uart->status_irq, | 729 | if (uart->cts_pin >= 0) { |
730 | bfin_serial_mctrl_cts_int, | 730 | if (request_irq(uart->status_irq, bfin_serial_mctrl_cts_int, |
731 | 0, "BFIN_UART_MODEM_STATUS", uart)) { | 731 | IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) { |
732 | uart->cts_pin = -1; | 732 | uart->cts_pin = -1; |
733 | pr_info("Unable to attach BlackFin UART Modem Status interrupt.\n"); | 733 | dev_info(port->dev, "Unable to attach BlackFin UART Modem Status interrupt.\n"); |
734 | } | 734 | } |
735 | 735 | ||
736 | /* CTS RTS PINs are negative assertive. */ | 736 | /* CTS RTS PINs are negative assertive. */ |
737 | UART_PUT_MCR(uart, ACTS); | 737 | UART_PUT_MCR(uart, ACTS); |
738 | UART_SET_IER(uart, EDSSI); | 738 | UART_SET_IER(uart, EDSSI); |
739 | } | ||
739 | #endif | 740 | #endif |
740 | 741 | ||
741 | UART_SET_IER(uart, ERBFI); | 742 | UART_SET_IER(uart, ERBFI); |