Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f9b8389 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-5.0-rc3' of... 

Merge tag 'usb-serial-5.0-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-linus

Johan writes:

USB-serial fixes for 5.0-rc3

Here's a fix for the new ftdi gpio support, which failed to take
autosuspend into account, and a patch adding missing SPDX identifiers to
the keyspan headers.

Included are also some new device ids.

All but the SPDX patch have been in linux-next with no reported issues.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>

* tag 'usb-serial-5.0-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: keyspan_usa: add proper SPDX lines for .h files
  USB: serial: pl2303: add new PID to support PL2303TB
  USB: serial: ftdi_sio: fix GPIO not working in autosuspend
  USB: serial: simple: add Motorola Tetra TPG2200 device id
parents af707f58 527c1e56

drivers/usb/serial/ftdi_sio.c

+14 −1
Original line number Diff line number Diff line
@@ -1783,6 +1783,10 @@ static int ftdi_set_bitmode(struct usb_serial_port *port, u8 mode) 
	int result;

	u16 val;



	result = usb_autopm_get_interface(serial->interface);

	if (result)

		return result;



	val = (mode << 8) | (priv->gpio_output << 4) | priv->gpio_value;

	result = usb_control_msg(serial->dev,

				 usb_sndctrlpipe(serial->dev, 0),
@@ -1795,6 +1799,8 @@ static int ftdi_set_bitmode(struct usb_serial_port *port, u8 mode) 
			val, result);

	}



	usb_autopm_put_interface(serial->interface);



	return result;

}
@@ -1846,9 +1852,15 @@ static int ftdi_read_cbus_pins(struct usb_serial_port *port) 
	unsigned char *buf;

	int result;



	result = usb_autopm_get_interface(serial->interface);

	if (result)

		return result;



	buf = kmalloc(1, GFP_KERNEL);

	if (!buf)

	if (!buf) {

		usb_autopm_put_interface(serial->interface);

		return -ENOMEM;

	}



	result = usb_control_msg(serial->dev,

				 usb_rcvctrlpipe(serial->dev, 0),
@@ -1863,6 +1875,7 @@ static int ftdi_read_cbus_pins(struct usb_serial_port *port) 
	}



	kfree(buf);

	usb_autopm_put_interface(serial->interface);



	return result;

}

drivers/usb/serial/keyspan_usa26msg.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/*

	usa26msg.h

drivers/usb/serial/keyspan_usa28msg.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/*

	usa28msg.h

drivers/usb/serial/keyspan_usa49msg.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/*

	usa49msg.h

drivers/usb/serial/keyspan_usa67msg.h

+1 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause */

/*

	usa67msg.h