diff options
| author | Greg Kroah-Hartman <[email protected]> | 2020-01-22 09:05:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2020-01-22 09:05:34 +0100 |
| commit | c318f074d9fdeae16e19cbb2ed53b50d2bcdfdb8 (patch) | |
| tree | 44c6552fa919dfe1fc681949bf5d81fcf6a2beb8 /drivers/usb/serial/ch341.c | |
| parent | 7b2d7faa09fcbd0184634544f732f4b2da0b20a8 (diff) | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
Merge 5.5-rc7 into staging-next
We want the staging fixes in here as well
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/serial/ch341.c')
| -rw-r--r-- | drivers/usb/serial/ch341.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index df582fe855f0..d3f420f3a083 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c @@ -642,9 +642,13 @@ static int ch341_tiocmget(struct tty_struct *tty) static int ch341_reset_resume(struct usb_serial *serial) { struct usb_serial_port *port = serial->port[0]; - struct ch341_private *priv = usb_get_serial_port_data(port); + struct ch341_private *priv; int ret; + priv = usb_get_serial_port_data(port); + if (!priv) + return 0; + /* reconfigure ch341 serial port after bus-reset */ ch341_configure(serial->dev, priv); |