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

Commit a9aedb09 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: PCI unblock config access fix 



Fix to make sure user config accesses get re-enabled if the
PCI config write to start BIST fails.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 24d6f2b5

drivers/scsi/ipr.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -6390,6 +6390,7 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd) 
	rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START);

	rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START);





	if (rc != PCIBIOS_SUCCESSFUL) {

	if (rc != PCIBIOS_SUCCESSFUL) {

		pci_unblock_user_cfg_access(ipr_cmd->ioa_cfg->pdev);

		ipr_cmd->ioasa.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);

		ipr_cmd->ioasa.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);

		rc = IPR_RC_JOB_CONTINUE;

		rc = IPR_RC_JOB_CONTINUE;

	} else {

	} else {