From 4bcd6ad5b32e0645fbca581f97a42eb776ee0a6d Mon Sep 17 00:00:00 2001
From: Brian King <brking@us.ibm.com>
Date: Tue, 27 Sep 2005 01:21:56 -0700
Subject: [PATCH] --- yaml --- r: 10666 b: refs/heads/master c:
 b30197d2c07b396907b81673354a015a9d2b216c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bc62e61a75f4..b2323ecb3bd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04b0ea2e0f9c1bb0d874db4493fc7f7a623116b
+refs/heads/master: b30197d2c07b396907b81673354a015a9d2b216c
diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c
index babd48363402..e0039dfae8e5 100644
--- a/trunk/drivers/scsi/ipr.c
+++ b/trunk/drivers/scsi/ipr.c
@@ -4944,6 +4944,7 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
 	int rc;
 
 	ENTER;
+	pci_unblock_user_cfg_access(ioa_cfg->pdev);
 	rc = pci_restore_state(ioa_cfg->pdev);
 
 	if (rc != PCIBIOS_SUCCESSFUL) {
@@ -4998,6 +4999,7 @@ static int ipr_reset_start_bist(struct ipr_cmnd *ipr_cmd)
 	int rc;
 
 	ENTER;
+	pci_block_user_cfg_access(ioa_cfg->pdev);
 	rc = pci_write_config_byte(ioa_cfg->pdev, PCI_BIST, PCI_BIST_START);
 
 	if (rc != PCIBIOS_SUCCESSFUL) {