diff options
| author | Don Brace | 2016-07-01 20:37:38 +0200 |
|---|---|---|
| committer | Martin K. Petersen | 2016-07-15 21:40:54 +0200 |
| commit | 3fb134cb4c170debf2b786d689fe263186feea4b (patch) | |
| tree | 0dbb7d60398155a57f1d65e06af2f4a5b853a6b5 /drivers/scsi | |
| parent | hpsa: correct skipping masked peripherals (diff) | |
| download | kernel-qcow2-linux-3fb134cb4c170debf2b786d689fe263186feea4b.tar.gz kernel-qcow2-linux-3fb134cb4c170debf2b786d689fe263186feea4b.tar.xz kernel-qcow2-linux-3fb134cb4c170debf2b786d689fe263186feea4b.zip | |
hpsa: change hpsa_passthru_ioctl timeout
Was not alloting for FW Flash times.
Reviewed-by: Scott Teel <scott.teel@microsemi.com>
Reviewed-by: Kevin Barnett <kevin.barnett@microsemi.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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 375a39632a7a..030d0023e1d2 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -6524,7 +6524,7 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) c->SG[0].Ext = cpu_to_le32(HPSA_SG_LAST); /* not chaining */ } rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, - DEFAULT_TIMEOUT); + NO_TIMEOUT); if (iocommand.buf_size > 0) hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL); check_ioctl_unit_attention(h, c); @@ -6657,7 +6657,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) c->SG[--i].Ext = cpu_to_le32(HPSA_SG_LAST); } status = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, - DEFAULT_TIMEOUT); + NO_TIMEOUT); if (sg_used) hpsa_pci_unmap(h->pdev, c, sg_used, PCI_DMA_BIDIRECTIONAL); check_ioctl_unit_attention(h, c); |