diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 14:10:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 14:10:23 -0300 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /drivers/char/cyclades.c | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/char/cyclades.c')
| -rw-r--r-- | drivers/char/cyclades.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index e991dc85f2f..fe6d774fe2e 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c @@ -3700,14 +3700,15 @@ cy_tiocmset(struct tty_struct *tty, struct file *file, /* * cy_break() --- routine which turns the break handling on or off */ -static void cy_break(struct tty_struct *tty, int break_state) +static int cy_break(struct tty_struct *tty, int break_state) { struct cyclades_port *info = tty->driver_data; struct cyclades_card *card; unsigned long flags; + int retval = 0; if (serial_paranoia_check(info, tty->name, "cy_break")) - return; + return -EINVAL; card = info->card; @@ -3736,8 +3737,6 @@ static void cy_break(struct tty_struct *tty, int break_state) } } } else { - int retval; - if (break_state == -1) { retval = cyz_issue_cmd(card, info->line - card->first_line, @@ -3758,6 +3757,7 @@ static void cy_break(struct tty_struct *tty, int break_state) } } spin_unlock_irqrestore(&card->card_lock, flags); + return retval; } /* cy_break */ static int get_mon_info(struct cyclades_port *info, |