[SCSI] libiscsi: fix setting of nop timer

If we rollover then we could get a next_timeout of zero, so we need
to set the new timer to that value.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index c8c00e173414..b2a1ec8725b8 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1384,14 +1384,11 @@ static void iscsi_check_transport_timeouts(unsigned long data)
                         iscsi_send_nopout(conn, NULL);
                 }
                 next_timeout = last_recv + timeout + (conn->ping_timeout * HZ);
-        } else {
+        } else
                 next_timeout = last_recv + timeout;
-        }
 
-        if (next_timeout) {
-                debug_scsi("Setting next tmo %lu\n", next_timeout);
-                mod_timer(&conn->transport_timer, next_timeout);
-        }
+        debug_scsi("Setting next tmo %lu\n", next_timeout);
+        mod_timer(&conn->transport_timer, next_timeout);
 done:
         spin_unlock(&session->lock);
 }