Changeset 18889 for src/linux/universal/linux-3.2/drivers/pci/pcie/aspm.c

Timestamp:

04/02/12 20:48:15 (15 months ago)

Author:

BrainSlayer

Message:

update to 3.2.14 and 3.3.1

File:

• src/linux/universal/linux-3.2/drivers/pci/pcie/aspm.c (modified) (2 diffs)

src/linux/universal/linux-3.2/drivers/pci/pcie/aspm.c

@@ -501 +501 @@
         u32 reg32;
 
-        if (aspm_disabled)
-                return 0;
-
         /*
          * Some functions in a slot might not all be PCIe functions,
@@ -512 +509 @@
                 if (!pos)
                         return -EINVAL;
+
+                /*
+                 * If ASPM is disabled then we're not going to change
+                 * the BIOS state. It's safe to continue even if it's a
+                 * pre-1.1 device
+                 */
+
+                if (aspm_disabled)
+                        continue;
+
                 /*
                  * Disable ASPM for pre-1.1 PCIe device, we follow MS to use