Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index f28ea070d3df4631306aa3385b854502e7eeef74..3cbb57a8b8468e28cf9057faedcfb4824f52b190 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -398,7 +398,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        shost->ordered_tag = sht->ordered_tag;
        shost->no_write_same = sht->no_write_same;
 
-       if (shost_eh_deadline == -1)
+       if (shost_eh_deadline == -1 || !sht->eh_host_reset_handler)
                shost->eh_deadline = -1;
        else if ((ulong) shost_eh_deadline * HZ > INT_MAX) {
                shost_printk(KERN_WARNING, shost,