From 8ec72d5a592730d464966c7262219933dc0dac7c Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 22 Mar 2007 21:51:39 +1100
Subject: [PATCH] --- yaml --- r: 53346 b: refs/heads/master c:
 128bc5fced238752d01b5169077f2ec624b3d59b h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/msi.c | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 933ad86c7505..6fc6081ed06e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1e2303dba021ee417c65a89e467a2b145ff9217
+refs/heads/master: 128bc5fced238752d01b5169077f2ec624b3d59b
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index d5b9b94a2ac5..b6dc69ef80a7 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -525,12 +525,7 @@ void pci_disable_msi(struct pci_dev* dev)
 	struct msi_desc *entry;
 	int default_irq;
 
-	if (!pci_msi_enable)
-		return;
-	if (!dev)
-		return;
-
-	if (!dev->msi_enabled)
+	if (!pci_msi_enable || !dev || !dev->msi_enabled)
 		return;
 
 	msi_set_enable(dev, 0);
@@ -656,12 +651,7 @@ static void msix_free_all_irqs(struct pci_dev *dev)
 
 void pci_disable_msix(struct pci_dev* dev)
 {
-	if (!pci_msi_enable)
-		return;
-	if (!dev)
-		return;
-
-	if (!dev->msix_enabled)
+	if (!pci_msi_enable || !dev || !dev->msix_enabled)
 		return;
 
 	msix_set_enable(dev, 0);