From e45ade2e6592cbe5763dcd16c0f91bd17a456ba0 Mon Sep 17 00:00:00 2001 From: Myron Stowe Date: Mon, 9 Jul 2012 15:36:08 -0600 Subject: [PATCH] --- yaml --- r: 316536 b: refs/heads/master c: dff3aef7139ce1be190be6d13505a35d5c7c0c3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b7ae85a1619d..b111a422ba7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2729d5b18df363167d0c0be428876f3c07d2617b +refs/heads/master: dff3aef7139ce1be190be6d13505a35d5c7c0c3c diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 51c4a4409e8c..50448c291a8f 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -2541,15 +2541,18 @@ static void __devinit __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all) else nv_ht_enable_msi_mapping(dev); } - return; + goto out; } /* HT MSI is not enabled */ if (found == 1) - return; + goto out; /* Host bridge is not to HT, disable HT MSI mapping on this device */ ht_disable_msi_mapping(dev); + +out: + pci_dev_put(host_bridge); } static void __devinit nv_msi_ht_cap_quirk_all(struct pci_dev *dev)