diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-03 18:59:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-03 18:59:34 +0200 |
| commit | 3510c8164ccbda7150379900f71078ce6ab23550 (patch) | |
| tree | 1828ee2176371238090f349c909e1a259273800c /drivers/usb/serial/ch341.c | |
| parent | 8b86ed078a65433a60ff59091a136d23724bd6d3 (diff) | |
| parent | 65dd82ae453f5290be0ea83ed0f23163ea49c0eb (diff) | |
| download | linux-3510c8164ccbda7150379900f71078ce6ab23550.tar.bz2 | |
Merge tag 'usb-serial-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v4.1-rc1
Fix up the f81232 driver, which up to this point has mostly been a
placeholder without a proper implementation.
Included is also a minor clean up of ch341.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/ch341.c')
| -rw-r--r-- | drivers/usb/serial/ch341.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index ede4f5fcfadd..c73808f095bb 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -325,7 +325,6 @@ static int ch341_open(struct tty_struct *tty, struct usb_serial_port *port) if (r) { dev_err(&port->dev, "%s - failed to submit interrupt urb: %d\n", __func__, r); - ch341_close(port); goto out; } |