Skip to contentSkip to conversation

Add enable_ms to jsm driver

PATCH In review Paul Larson 2 participants 2 messages Jan 30, 2009 – Feb 2, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Add enable_ms to jsm driver

This fixes a crash observed when non-existant enable_ms function is called for jsm driver.

---
 drivers/serial/jsm/jsm_tty.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/serial/jsm/jsm_tty.c +6 -0
index 3547558..324c74d 100644
@@ -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,
#1 lore raw
Quoted 27 lines · On Fri, 30 Jan 2009 10:21:49 -0600 Paul Larson <[email protected]> wrote:

This fixes a crash observed when non-existant enable_ms function is called for jsm driver.

---
 drivers/serial/jsm/jsm_tty.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
drivers/serial/jsm/jsm_tty.c +5 -0
index 3547558..324c74d 100644
@@ -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;

drivers/serial/jsm/jsm_tty.c static struct uart_ops jsm_ops = { · line 356

Quoted 7 lines
drivers/serial/jsm/jsm_tty.c +1 -0
@@ -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,

This patch is now in mainline for 2.6.29, as
0461ec5bc7745b89a8ab67ba0ea497abd58a6301.

It appears to be needed in every 2.6.x kernel back to at least 2.6.25, but nobody told the -stable maintainers about this.

An appropriate way of flagging this is to add

to the changelog body.