[PATCH] apply nForce2 fixup only if C1 Halt Disconnect is enabled

Some boards don't support C1 Halt Disconnect.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index ac6acb3cef7597edd049fdb0afa8c6bea6c8afbe..a8b1954aec9e0458cf69969b79efcdc94c28c323 100644 (file)
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -226,7 +226,12 @@ static void __init pci_fixup_nforce2(struct pci_dev *dev)
        fixed_val = rev < 0xC1 ? 0x1F01FF01 : 0x9F01FF01;
 
        pci_read_config_dword(dev, 0x6c, &val);
-       if (val != fixed_val) {
+
+       /*
+        * Apply fixup only if C1 Halt Disconnect is enabled
+        * (bit28) because it is not supported on some boards.
+        */
+       if ((val & (1 << 28)) && val != fixed_val) {
                printk(KERN_WARNING "PCI: nForce2 C1 Halt Disconnect fixup\n");
                pci_write_config_dword(dev, 0x6c, fixed_val);
        }