From d844f3c82e6fdf167fe162138cf2ca5d609a040c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 11 Jun 2015 16:40:40 +0000 Subject: [PATCH] Merge r5900 from the iser branch git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6274 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/isert-scst/isert_login.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c index 0ba39af33..400ceb92f 100644 --- a/iscsi-scst/kernel/isert-scst/isert_login.c +++ b/iscsi-scst/kernel/isert-scst/isert_login.c @@ -86,8 +86,8 @@ static struct isert_conn_dev *get_available_dev(struct isert_listener_dev *dev, static void isert_del_timer(struct isert_conn_dev *dev) { if (dev->timer_active) { - del_timer_sync(&dev->tmo_timer); dev->timer_active = 0; + del_timer_sync(&dev->tmo_timer); } } @@ -239,6 +239,7 @@ int isert_conn_alloc(struct iscsi_session *session, goto cleanup_conn; conn->rd_state = 1; + isert_del_timer(dev); isert_dev_release(dev); isert_set_priv(conn, NULL);