Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fb134cb authored by Don Brace's avatar Don Brace Committed by Martin K. Petersen
Browse files

hpsa: change hpsa_passthru_ioctl timeout 



Was not alloting for FW Flash times.

Reviewed-by: default avatarScott Teel <scott.teel@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 64ce60ca

drivers/scsi/hpsa.c

+2 −2
Original line number Diff line number Diff line
@@ -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);