[PATCH v5 10/10] USB: io_ti: Call cancel_delayed_work_sync() unconditionally

[Peter E. Berger]

From: "Peter E. Berger" <pber...@brimson.com>

Call cancel_delayed_work_sync() unconditionally in edge_release()
and edge_suspend().

Signed-off-by: Peter E. Berger <pber...@brimson.com>
---
 drivers/usb/serial/io_ti.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 194e469..1be3a57 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2461,8 +2461,7 @@ static void edge_release(struct usb_serial *serial)
 {
        struct edgeport_serial *edge_serial = usb_get_serial_data(serial);
 
-       if (edge_serial->fw_version > FW_HEARTBEAT_VERSION_CUTOFF)
-               cancel_delayed_work_sync(&edge_serial->heartbeat_work);
+       cancel_delayed_work_sync(&edge_serial->heartbeat_work);
        kfree(edge_serial);
 }
 
@@ -2572,8 +2571,7 @@ static int edge_suspend(struct usb_serial *serial, 
pm_message_t message)
 {
        struct edgeport_serial *edge_serial = usb_get_serial_data(serial);
 
-       if (edge_serial->fw_version > FW_HEARTBEAT_VERSION_CUTOFF)
-               cancel_delayed_work_sync(&edge_serial->heartbeat_work);
+       cancel_delayed_work_sync(&edge_serial->heartbeat_work);
 
        return 0;
 }
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html