summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDon Brace2017-03-10 21:35:23 +0100
committerMartin K. Petersen2017-03-15 18:37:17 +0100
commit2ef2884980873081a4edae92f9d88dd580c85f6e (patch)
tree4e403cc7038fab52e0dddcaa17079f2d59e8e8b2 /drivers/scsi
parentscsi: hpsa: limit outstanding rescans (diff)
downloadkernel-qcow2-linux-2ef2884980873081a4edae92f9d88dd580c85f6e.tar.gz
kernel-qcow2-linux-2ef2884980873081a4edae92f9d88dd580c85f6e.tar.xz
kernel-qcow2-linux-2ef2884980873081a4edae92f9d88dd580c85f6e.zip
scsi: hpsa: do not timeout reset operations
Resets can take longer than DEFAULT_TIMEOUT. Reviewed-by: Scott Benesh <scott.benesh@microsemi.com> Reviewed-by: Scott Teel <scott.teel@microsemi.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: Don Brace <don.brace@microsemi.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 0a8ac68f4ca1..0d0be7754a65 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -2956,7 +2956,7 @@ static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr,
/* fill_cmd can't fail here, no data buffer to map. */
(void) fill_cmd(c, reset_type, h, NULL, 0, 0,
scsi3addr, TYPE_MSG);
- rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, DEFAULT_TIMEOUT);
+ rc = hpsa_scsi_do_simple_cmd(h, c, reply_queue, NO_TIMEOUT);
if (rc) {
dev_warn(&h->pdev->dev, "Failed to send reset command\n");
goto out;