diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 12:33:47 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 14:18:18 -0400 |
| commit | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (patch) | |
| tree | 9034d676d9096857a380aab9d99e3e88fccb6bfe /drivers/char/amiserial.c | |
| parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
| parent | aeee90dfa01844168cd7f8051d0a0f969c573067 (diff) | |
Merge Linus' latest into master
Conflicts:
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
Diffstat (limited to 'drivers/char/amiserial.c')
| -rw-r--r-- | drivers/char/amiserial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 3530ff417a51..6e763e3f5a81 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c | |||
| @@ -1254,7 +1254,7 @@ static int rs_break(struct tty_struct *tty, int break_state) | |||
| 1254 | unsigned long flags; | 1254 | unsigned long flags; |
| 1255 | 1255 | ||
| 1256 | if (serial_paranoia_check(info, tty->name, "rs_break")) | 1256 | if (serial_paranoia_check(info, tty->name, "rs_break")) |
| 1257 | return; | 1257 | return -EINVAL; |
| 1258 | 1258 | ||
| 1259 | local_irq_save(flags); | 1259 | local_irq_save(flags); |
| 1260 | if (break_state == -1) | 1260 | if (break_state == -1) |