Commit 0e4b470c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'usb-serial-4.13-rc1' of...

Merge tag 'usb-serial-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB-serial updates for v4.13-rc1

Here are the USB-serial updates for 4.13, including support for
manipulating the modem-control signals of qcserial devices, propagation
of errnos after late probe errors from usb-serial core, and a couple of
clean ups.

All have been in linux-next with no reported issues.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents f0d657e8 c22ac6d2
...@@ -454,6 +454,8 @@ static struct usb_serial_driver qcdevice = { ...@@ -454,6 +454,8 @@ static struct usb_serial_driver qcdevice = {
.write = usb_wwan_write, .write = usb_wwan_write,
.write_room = usb_wwan_write_room, .write_room = usb_wwan_write_room,
.chars_in_buffer = usb_wwan_chars_in_buffer, .chars_in_buffer = usb_wwan_chars_in_buffer,
.tiocmget = usb_wwan_tiocmget,
.tiocmset = usb_wwan_tiocmset,
.attach = qc_attach, .attach = qc_attach,
.release = qc_release, .release = qc_release,
.port_probe = usb_wwan_port_probe, .port_probe = usb_wwan_port_probe,
......
...@@ -288,7 +288,7 @@ static void upd78f0730_dtr_rts(struct usb_serial_port *port, int on) ...@@ -288,7 +288,7 @@ static void upd78f0730_dtr_rts(struct usb_serial_port *port, int on)
static speed_t upd78f0730_get_baud_rate(struct tty_struct *tty) static speed_t upd78f0730_get_baud_rate(struct tty_struct *tty)
{ {
const speed_t baud_rate = tty_get_baud_rate(tty); const speed_t baud_rate = tty_get_baud_rate(tty);
const speed_t supported[] = { static const speed_t supported[] = {
0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600 0, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 153600
}; };
int i; int i;
...@@ -384,7 +384,7 @@ static void upd78f0730_set_termios(struct tty_struct *tty, ...@@ -384,7 +384,7 @@ static void upd78f0730_set_termios(struct tty_struct *tty,
static int upd78f0730_open(struct tty_struct *tty, struct usb_serial_port *port) static int upd78f0730_open(struct tty_struct *tty, struct usb_serial_port *port)
{ {
struct upd78f0730_open_close request = { static const struct upd78f0730_open_close request = {
.opcode = UPD78F0730_CMD_OPEN_CLOSE, .opcode = UPD78F0730_CMD_OPEN_CLOSE,
.state = UPD78F0730_PORT_OPEN .state = UPD78F0730_PORT_OPEN
}; };
...@@ -402,7 +402,7 @@ static int upd78f0730_open(struct tty_struct *tty, struct usb_serial_port *port) ...@@ -402,7 +402,7 @@ static int upd78f0730_open(struct tty_struct *tty, struct usb_serial_port *port)
static void upd78f0730_close(struct usb_serial_port *port) static void upd78f0730_close(struct usb_serial_port *port)
{ {
struct upd78f0730_open_close request = { static const struct upd78f0730_open_close request = {
.opcode = UPD78F0730_CMD_OPEN_CLOSE, .opcode = UPD78F0730_CMD_OPEN_CLOSE,
.state = UPD78F0730_PORT_CLOSE .state = UPD78F0730_PORT_CLOSE
}; };
......
This diff is collapsed.
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