diff --git a/[refs] b/[refs] index a8bf3ee89050..1bf4e8a1c327 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f3b902ed8147c42a4a9764014c758e6b3f42f51 +refs/heads/master: 7726c3308a92b4a4c3bd059059498fca0e6f8e48 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 1a7c48d71dc7..9104671e4b72 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -2166,6 +2166,10 @@ static void __devinit nv_msi_ht_cap_quirk(struct pci_dev *dev) int pos; int found; + /* Enabling HT MSI mapping on this device breaks MCP51 */ + if (dev->device == 0x270) + return; + /* check if there is HT MSI cap or enabled on this device */ found = ht_check_msi_mapping(dev);