git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
char
/
cyclades.c
diff --git
a/drivers/char/cyclades.c
b/drivers/char/cyclades.c
index
e991dc8
..
fe6d774
100644
(file)
--- 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
*/
/*
* 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;
{
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"))
if (serial_paranoia_check(info, tty->name, "cy_break"))
- return;
+ return
-EINVAL
;
card = info->card;
card = info->card;
@@
-3736,8
+3737,6
@@
static void cy_break(struct tty_struct *tty, int break_state)
}
}
} else {
}
}
} else {
- int retval;
-
if (break_state == -1) {
retval = cyz_issue_cmd(card,
info->line - card->first_line,
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);
}
}
spin_unlock_irqrestore(&card->card_lock, flags);
+ return retval;
} /* cy_break */
static int get_mon_info(struct cyclades_port *info,
} /* cy_break */
static int get_mon_info(struct cyclades_port *info,