OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f2257b7
)
Add enable_ms to jsm driver
author
Paul Larson
<pl@linux.vnet.ibm.com>
Fri, 30 Jan 2009 16:21:49 +0000
(10:21 -0600)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 30 Jan 2009 16:40:54 +0000
(08:40 -0800)
This fixes a crash observed when non-existant enable_ms function is
called for jsm driver.
Signed-off-by: Scott Kilau <Scott.Kilau@digi.com>
Signed-off-by: Paul Larson <pl@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/serial/jsm/jsm_tty.c
patch
|
blob
|
history
diff --git
a/drivers/serial/jsm/jsm_tty.c
b/drivers/serial/jsm/jsm_tty.c
index
3547558
..
324c74d
100644
(file)
--- a/
drivers/serial/jsm/jsm_tty.c
+++ b/
drivers/serial/jsm/jsm_tty.c
@@
-161,6
+161,11
@@
static void jsm_tty_stop_rx(struct uart_port *port)
channel->ch_bd->bd_ops->disable_receiver(channel);
}
+static void jsm_tty_enable_ms(struct uart_port *port)
+{
+ /* Nothing needed */
+}
+
static void jsm_tty_break(struct uart_port *port, int break_state)
{
unsigned long lock_flags;
@@
-345,6
+350,7
@@
static struct uart_ops jsm_ops = {
.start_tx = jsm_tty_start_tx,
.send_xchar = jsm_tty_send_xchar,
.stop_rx = jsm_tty_stop_rx,
+ .enable_ms = jsm_tty_enable_ms,
.break_ctl = jsm_tty_break,
.startup = jsm_tty_open,
.shutdown = jsm_tty_close,