Commit 52772a7f authored by Johan Hovold's avatar Johan Hovold

USB: pl2303: disable break on shutdown

Currently an enabled break state is not disabled on final close nor on
re-open and has to be disabled manually.

Fix this by disabling break on port shutdown.
Reported-by: default avatarJari Ruusu <jariruusu@users.sourceforge.net>
Tested-by: default avatarJari Ruusu <jariruusu@users.sourceforge.net>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent db81de76
...@@ -132,6 +132,7 @@ MODULE_DEVICE_TABLE(usb, id_table); ...@@ -132,6 +132,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define UART_OVERRUN_ERROR 0x40 #define UART_OVERRUN_ERROR 0x40
#define UART_CTS 0x80 #define UART_CTS 0x80
static void pl2303_set_break(struct usb_serial_port *port, bool enable);
enum pl2303_type { enum pl2303_type {
TYPE_01, /* Type 0 and 1 (difference unknown) */ TYPE_01, /* Type 0 and 1 (difference unknown) */
...@@ -615,6 +616,7 @@ static void pl2303_close(struct usb_serial_port *port) ...@@ -615,6 +616,7 @@ static void pl2303_close(struct usb_serial_port *port)
{ {
usb_serial_generic_close(port); usb_serial_generic_close(port);
usb_kill_urb(port->interrupt_in_urb); usb_kill_urb(port->interrupt_in_urb);
pl2303_set_break(port, false);
} }
static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port) static int pl2303_open(struct tty_struct *tty, struct usb_serial_port *port)
...@@ -741,17 +743,16 @@ static int pl2303_ioctl(struct tty_struct *tty, ...@@ -741,17 +743,16 @@ static int pl2303_ioctl(struct tty_struct *tty,
return -ENOIOCTLCMD; return -ENOIOCTLCMD;
} }
static void pl2303_break_ctl(struct tty_struct *tty, int break_state) static void pl2303_set_break(struct usb_serial_port *port, bool enable)
{ {
struct usb_serial_port *port = tty->driver_data;
struct usb_serial *serial = port->serial; struct usb_serial *serial = port->serial;
u16 state; u16 state;
int result; int result;
if (break_state == 0) if (enable)
state = BREAK_OFF;
else
state = BREAK_ON; state = BREAK_ON;
else
state = BREAK_OFF;
dev_dbg(&port->dev, "%s - turning break %s\n", __func__, dev_dbg(&port->dev, "%s - turning break %s\n", __func__,
state == BREAK_OFF ? "off" : "on"); state == BREAK_OFF ? "off" : "on");
...@@ -763,6 +764,13 @@ static void pl2303_break_ctl(struct tty_struct *tty, int break_state) ...@@ -763,6 +764,13 @@ static void pl2303_break_ctl(struct tty_struct *tty, int break_state)
dev_err(&port->dev, "error sending break = %d\n", result); dev_err(&port->dev, "error sending break = %d\n", result);
} }
static void pl2303_break_ctl(struct tty_struct *tty, int state)
{
struct usb_serial_port *port = tty->driver_data;
pl2303_set_break(port, state);
}
static void pl2303_update_line_status(struct usb_serial_port *port, static void pl2303_update_line_status(struct usb_serial_port *port,
unsigned char *data, unsigned char *data,
unsigned int actual_length) unsigned int actual_length)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment