---

yaml --- r: 349011 b: refs/heads/master c: 9e16721 h: refs/heads/master i: 349009: 8d7552b 349007: f7dc72c v: v3
git-mirror · Jan 14, 2013 · afa2877 · afa2877
1 parent 6137877
commit afa2877
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d712f686ced38e248e510cc6b6f9498791f874cc
+refs/heads/master: 9e16721498b0c3d3ebfa0b503c63d35c0a4c0642
diff --git a/trunk/drivers/pci/pcie/aspm.c b/trunk/drivers/pci/pcie/aspm.c
@@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus)
 {
 	struct pci_dev *child;
 
+	if (aspm_force)
+		return;
+
 	/*
 	 * Clear any ASPM setup that the firmware has carried out on this bus
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -771,6 +771,9 @@ void pcie_clear_aspm(struct pci_bus *bus) @@
     {
     	struct pci_dev *child;
+    	if (aspm_force)
+    		return;
     	/*
     	 * Clear any ASPM setup that the firmware has carried out on this bus
     	 */
@@ Expand Down @@