diff options
| author | Johan Hovold <johan@kernel.org> | 2017-01-03 16:39:45 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2017-01-04 10:37:17 +0100 |
| commit | 2330d0a853da260d8a9834a70df448032b9ff623 (patch) | |
| tree | 910a076d3386b2a8c2443e4078a2484c8e14e394 | |
| parent | USB: serial: io_ti: fix another NULL-deref at open (diff) | |
| download | linux-2330d0a853da260d8a9834a70df448032b9ff623.tar.xz linux-2330d0a853da260d8a9834a70df448032b9ff623.zip | |
USB: serial: io_ti: fix I/O after disconnect
Cancel the heartbeat work on driver unbind in order to avoid I/O after
disconnect in case the port is held open.
Note that the cancel in release() is still needed to stop the heartbeat
after late probe errors.
Fixes: 26c78daade0f ("USB: io_ti: Add heartbeat to keep idle EP/416
ports from disconnecting")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
| -rw-r--r-- | drivers/usb/serial/io_ti.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 3b1cfba0ec84..4b0b978fb356 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -2590,6 +2590,9 @@ static int edge_startup(struct usb_serial *serial) static void edge_disconnect(struct usb_serial *serial) { + struct edgeport_serial *edge_serial = usb_get_serial_data(serial); + + cancel_delayed_work_sync(&edge_serial->heartbeat_work); } static void edge_release(struct usb_serial *serial) |