1 files changed, 7 insertions, 0 deletions

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 16df726ba7a5..9b059d9d4ab5 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2374,6 +2374,13 @@ static void __devinit check_msi(struct azx *chip)
                        "hda_intel: msi for device %04x:%04x set to %d\n",
                        q->subvendor, q->subdevice, q->value);
                 chip->msi = q->value;
+                return;
+        }
+
+        /* NVidia chipsets seem to cause troubles with MSI */
+        if (chip->driver_type == AZX_DRIVER_NVIDIA) {
+                printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");
+                chip->msi = 0;
         }
 }