diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-05 18:15:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-05 18:15:17 +0300 |
| commit | d3d5389475e8554842ec5640e1e0e93a298f2680 (patch) | |
| tree | eb39b8220b32e05f3c76ca710f549269dabbee61 /drivers/usb/serial/mxuport.c | |
| parent | b20b1618b8fca858c83e52da4aa22cd6b13b0359 (diff) | |
| parent | c7d373c3f0da2b2b78c4b1ce5ae41485b3ef848c (diff) | |
| download | linux-d3d5389475e8554842ec5640e1e0e93a298f2680.tar.xz | |
Merge tag 'usb-serial-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.0-rc3
Here are a few fixes for reported problems including a usb-debug device
buffer overflow, potential use-after-free on failed probe, and a couple
of issues with the USB console.
Some new device IDs are also added.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/mxuport.c')
| -rw-r--r-- | drivers/usb/serial/mxuport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c index ab1d690274ae..460a40669967 100644 --- a/drivers/usb/serial/mxuport.c +++ b/drivers/usb/serial/mxuport.c @@ -1284,7 +1284,8 @@ static int mxuport_open(struct tty_struct *tty, struct usb_serial_port *port) } /* Initial port termios */ - mxuport_set_termios(tty, port, NULL); + if (tty) + mxuport_set_termios(tty, port, NULL); /* * TODO: use RQ_VENDOR_GET_MSR, once we know what it |