From 40a40abe7b90ffc2848bb0d7752b4aeea5d0dab4 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Tue, 23 Dec 2008 03:09:53 +0000
Subject: [PATCH] --- yaml --- r: 127410 b: refs/heads/master c:
 ef1bba28bfe68ef3c0488feeaabd3e8bc523130c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/net/sfc/falcon.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 78cb16bed4a3..fdc7d73be823 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a479079c07211bf348ac8a79754f26bea258f26
+refs/heads/master: ef1bba28bfe68ef3c0488feeaabd3e8bc523130c
diff --git a/trunk/drivers/net/sfc/falcon.c b/trunk/drivers/net/sfc/falcon.c
index 6884dc8c1f82..5b9f2d9cc4ed 100644
--- a/trunk/drivers/net/sfc/falcon.c
+++ b/trunk/drivers/net/sfc/falcon.c
@@ -1403,9 +1403,9 @@ static irqreturn_t falcon_fatal_interrupt(struct efx_nic *efx)
 	}
 
 	/* Disable both devices */
-	pci_disable_device(efx->pci_dev);
+	pci_clear_master(efx->pci_dev);
 	if (FALCON_IS_DUAL_FUNC(efx))
-		pci_disable_device(nic_data->pci_dev2);
+		pci_clear_master(nic_data->pci_dev2);
 	falcon_disable_interrupts(efx);
 
 	if (++n_int_errors < FALCON_MAX_INT_ERRORS) {