diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /drivers/char | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/serial167.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 3b23270eaa65..a8f15e6be594 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -418,7 +418,7 @@ static irqreturn_t cd2401_rxerr_interrupt(int irq, void *dev_id) | |||
| 418 | TTY_OVERRUN); | 418 | TTY_OVERRUN); |
| 419 | /* | 419 | /* |
| 420 | If the flip buffer itself is | 420 | If the flip buffer itself is |
| 421 | overflowing, we still loose | 421 | overflowing, we still lose |
| 422 | the next incoming character. | 422 | the next incoming character. |
| 423 | */ | 423 | */ |
| 424 | if (tty_buffer_request_room(tty, 1) != | 424 | if (tty_buffer_request_room(tty, 1) != |