From fd317a5df3c7e8030078ca3176e7e368d996c17c Mon Sep 17 00:00:00 2001
From: Gavin Shan <shangw@linux.vnet.ibm.com>
Date: Thu, 4 Apr 2013 16:54:31 +0000
Subject: [PATCH] --- yaml --- r: 362901 b: refs/heads/master c:
 cdf1fd4d906bc8c06510fd3e1d6a073441792792 h: refs/heads/master i:   362899:
 3b1c9ca00766f746e4e825a8efa1a52979f68344 v: v3

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

diff --git a/[refs] b/[refs]
index abc0e18914d1..9ac54ea6228a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e375b561817d9ae098cc4296a729fc88924a0159
+refs/heads/master: cdf1fd4d906bc8c06510fd3e1d6a073441792792
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 99befbd99938..60a4b10fa99c 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -789,9 +789,6 @@ static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type)
 	if (ret)
 		return ret;
 
-	if (!pci_find_capability(dev, type))
-		return -EINVAL;
-
 	return 0;
 }
 
@@ -942,7 +939,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
 	int status, nr_entries;
 	int i, j;
 
-	if (!entries)
+	if (!entries || !dev->msix_cap)
 		return -EINVAL;
 
 	status = pci_msi_check_device(dev, nvec, PCI_CAP_ID_MSIX);