aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Brace <don.brace@microsemi.com>2016-07-01 14:37:38 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2016-07-15 15:40:54 -0400
commit3fb134cb4c170debf2b786d689fe263186feea4b (patch)
tree0dbb7d60398155a57f1d65e06af2f4a5b853a6b5
parent64ce60cab24603ac0fcd59c9fbc3be78f4c4d229 (diff)
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>
-rw-r--r--drivers/scsi/hpsa.c4
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)
6524 c->SG[0].Ext = cpu_to_le32(HPSA_SG_LAST); /* not chaining */ 6524 c->SG[0].Ext = cpu_to_le32(HPSA_SG_LAST); /* not chaining */
6525 } 6525 }
6526 rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, 6526 rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE,
6527 DEFAULT_TIMEOUT); 6527 NO_TIMEOUT);
6528 if (iocommand.buf_size > 0) 6528 if (iocommand.buf_size > 0)
6529 hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL); 6529 hpsa_pci_unmap(h->pdev, c, 1, PCI_DMA_BIDIRECTIONAL);
6530 check_ioctl_unit_attention(h, c); 6530 check_ioctl_unit_attention(h, c);
@@ -6657,7 +6657,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
6657 c->SG[--i].Ext = cpu_to_le32(HPSA_SG_LAST); 6657 c->SG[--i].Ext = cpu_to_le32(HPSA_SG_LAST);
6658 } 6658 }
6659 status = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, 6659 status = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE,
6660 DEFAULT_TIMEOUT); 6660 NO_TIMEOUT);
6661 if (sg_used) 6661 if (sg_used)
6662 hpsa_pci_unmap(h->pdev, c, sg_used, PCI_DMA_BIDIRECTIONAL); 6662 hpsa_pci_unmap(h->pdev, c, sg_used, PCI_DMA_BIDIRECTIONAL);
6663 check_ioctl_unit_attention(h, c); 6663 check_ioctl_unit_attention(h, c);