summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2003-01-08 23:08:50 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2003-01-08 23:08:50 +0000
commit994ee212940a805bbbca18f9866dfea64d934a6e (patch)
tree90e134892f15ee7d391d17ba69728fc1252874bd
parentcc9b418f97d1b345373631b111444eb10d71e6bc (diff)
[SERIAL] Bug fix: remove infinite loop in sa1100 serial driver.
-rw-r--r--drivers/serial/sa1100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 52377d5c9038..1690a7c2c2c5 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -447,7 +447,7 @@ sa1100_set_termios(struct uart_port *port, struct termios *termios,
/*
* We only support CS7 and CS8.
*/
- while ((termios->c_cflag & CSIZE) != CS7 ||
+ while ((termios->c_cflag & CSIZE) != CS7 &&
(termios->c_cflag & CSIZE) != CS8) {
termios->c_cflag &= ~CSIZE;
termios->c_cflag |= old_csize;