From cfadebdb3f4717d0f9d557bff52f4b73192c425d Mon Sep 17 00:00:00 2001
From: Brian King <brking@linux.vnet.ibm.com>
Date: Thu, 29 Mar 2007 12:43:23 -0500
Subject: [PATCH] --- yaml --- r: 53687 b: refs/heads/master c:
 a9aedb098437655b7b78d66e0e28405830cbdbef h: refs/heads/master i:   53685:
 86e80049f3578b0bb90d8d4c3f9a1d6f8e360e3f   53683:
 ed00cddf393fd655326cdccf5275c1cd1419a7b8   53679:
 e8a4031e8af93aca37e5f9131a13bbab3b112660 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/scsi/ipr.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3317720354e8..892a58653b54 100644
--- 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
index fc1171c7def4..b502c831cc5e 100644
--- 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 {