Merge branch 'upstream-fixes' into upstream

[linux-2.6] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2087a397ef16768d09498ab326a300b12ec14744..9855c4c920b82af7f106e0afb251f5251a5f032a 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -793,8 +793,10 @@ static int msix_capability_init(struct pci_dev *dev,
                if (!entry)
                        break;
                vector = get_msi_vector(dev);
-               if (vector < 0)
+               if (vector < 0) {
+                       kmem_cache_free(msi_cachep, entry);
                        break;
+               }
 
                j = entries[i].entry;
                entries[i].vector = vector;