projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tty: Add carrier processing on close to the tty_port core
[linux-2.6-block.git]
/
drivers
/
char
/
stallion.c
diff --git
a/drivers/char/stallion.c
b/drivers/char/stallion.c
index 2ad813a801dc391cc8bca62a4cc847b16ea0d4d1..53e504f41b2043fa89b4b9a83637fe31251d38ab 100644
(file)
--- a/
drivers/char/stallion.c
+++ b/
drivers/char/stallion.c
@@
-772,11
+772,11
@@
static int stl_carrier_raised(struct tty_port *port)
return (portp->sigs & TIOCM_CD) ? 1 : 0;
}
return (portp->sigs & TIOCM_CD) ? 1 : 0;
}
-static void stl_
raise_dtr_rts(struct tty_port *port
)
+static void stl_
dtr_rts(struct tty_port *port, int on
)
{
struct stlport *portp = container_of(port, struct stlport, port);
/* Takes brd_lock internally */
{
struct stlport *portp = container_of(port, struct stlport, port);
/* Takes brd_lock internally */
- stl_setsignals(portp,
1, 1
);
+ stl_setsignals(portp,
on, on
);
}
/*****************************************************************************/
}
/*****************************************************************************/
@@
-2547,7
+2547,7
@@
static const struct tty_operations stl_ops = {
static const struct tty_port_operations stl_port_ops = {
.carrier_raised = stl_carrier_raised,
static const struct tty_port_operations stl_port_ops = {
.carrier_raised = stl_carrier_raised,
- .
raise_dtr_rts = stl_raise
_dtr_rts,
+ .
dtr_rts = stl
_dtr_rts,
};
/*****************************************************************************/
};
/*****************************************************************************/