| From cb13ce4579174cfd060161c0e9d5cc6d456f1721 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 3 Jan 2017 16:39:45 +0100 |
| Subject: [PATCH] USB: serial: io_ti: fix I/O after disconnect |
| |
| commit 2330d0a853da260d8a9834a70df448032b9ff623 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c |
| index 07779c721242..8dab8e5e339e 100644 |
| --- a/drivers/usb/serial/io_ti.c |
| +++ b/drivers/usb/serial/io_ti.c |
| @@ -2593,6 +2593,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) |
| -- |
| 2.10.1 |
| |
