aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Larson <pl@linux.vnet.ibm.com>2009-01-30 10:21:49 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-06 13:47:19 -0800
commit826949add389c6cdee9412071aba4637160e1519 (patch)
treeeb77f4ee1bd5bc8ca183060fe6e991e4b158c7b1
parent8255fc826e58c0a59711029e01db9fcdc06ba211 (diff)
Add enable_ms to jsm driver
commit 0461ec5bc7745b89a8ab67ba0ea497abd58a6301 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 a697914ae3d..3fc7e0f739b 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)
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,