Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316536
b: refs/heads/master
c: dff3aef
h: refs/heads/master
v: v3
  • Loading branch information
Myron Stowe authored and Bjorn Helgaas committed Jul 9, 2012
1 parent d91dd25 commit e45ade2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2729d5b18df363167d0c0be428876f3c07d2617b
refs/heads/master: dff3aef7139ce1be190be6d13505a35d5c7c0c3c
7 changes: 5 additions & 2 deletions trunk/drivers/pci/quirks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit e45ade2

Please sign in to comment.