From afa2877b8a7a25898d7155f97218fcd78e3f0d05 Mon Sep 17 00:00:00 2001
From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 27 Nov 2012 14:09:40 +0000
Subject: [PATCH] --- yaml --- r: 349011 b: refs/heads/master c:
 9e16721498b0c3d3ebfa0b503c63d35c0a4c0642 h: refs/heads/master i:   349009:
 8d7552b228fe7c7eac618d73dba4149dfb073a71   349007:
 f7dc72c215e3b83b2a902df35a8bc8ace311627b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/pcie/aspm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fdbb1798d898..9220d3d0134c 100644
--- 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
index b52630b8eada..8474b6a4fc9b 100644
--- 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
 	 */