aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Larson <pl@linux.vnet.ibm.com>2009-01-30 11:21:49 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-30 11:40:54 -0500
commit0461ec5bc7745b89a8ab67ba0ea497abd58a6301 (patch)
tree251ae8afe1b392aefc01cb569cccbea870df2bab
parentf2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff)
Add enable_ms to jsm driver
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>
-rw-r--r--drivers/serial/jsm/jsm_tty.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c
index 3547558d2caf..324c74d2f666 100644
--- 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)
161 channel->ch_bd->bd_ops->disable_receiver(channel); 161 channel->ch_bd->bd_ops->disable_receiver(channel);
162} 162}
163 163
164static void jsm_tty_enable_ms(struct uart_port *port)
165{
166 /* Nothing needed */
167}
168
164static void jsm_tty_break(struct uart_port *port, int break_state) 169static void jsm_tty_break(struct uart_port *port, int break_state)
165{ 170{
166 unsigned long lock_flags; 171 unsigned long lock_flags;
@@ -345,6 +350,7 @@ static struct uart_ops jsm_ops = {
345 .start_tx = jsm_tty_start_tx, 350 .start_tx = jsm_tty_start_tx,
346 .send_xchar = jsm_tty_send_xchar, 351 .send_xchar = jsm_tty_send_xchar,
347 .stop_rx = jsm_tty_stop_rx, 352 .stop_rx = jsm_tty_stop_rx,
353 .enable_ms = jsm_tty_enable_ms,
348 .break_ctl = jsm_tty_break, 354 .break_ctl = jsm_tty_break,
349 .startup = jsm_tty_open, 355 .startup = jsm_tty_open,
350 .shutdown = jsm_tty_close, 356 .shutdown = jsm_tty_close,