---

yaml --- r: 53687 b: refs/heads/master c: a9aedb0 h: refs/heads/master i: 53685: 86e8004 53683: ed00cdd 53679: e8a4031 v: v3
git-mirror · Apr 1, 2007 · cfadebd · cfadebd
1 parent 58cf667
commit cfadebd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d6f2b50bd34d0da540a9e6f71c4b6ab25f4b93
+refs/heads/master: a9aedb098437655b7b78d66e0e28405830cbdbef
diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c
@@ -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);
 
 	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);
 		rc = IPR_RC_JOB_CONTINUE;
 	} else {