From c63fc9644c7bea14ef64c2724a3e8cf6cd1a5feb Mon Sep 17 00:00:00 2001
From: Kevin Baradon <kevin.baradon@gmail.com>
Date: Wed, 10 Oct 2012 10:50:49 +0000
Subject: [PATCH] --- yaml --- r: 334024 b: refs/heads/master c:
 aac9453b65c5d41eac133095586379be5b923a1e h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/ethernet/jme.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1513717327fc..361239f29a14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d0d0b160c389574f67cdcf6766ba9597102495d
+refs/heads/master: aac9453b65c5d41eac133095586379be5b923a1e
diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c
index c911d883c27e..f8064df10cc4 100644
--- a/trunk/drivers/net/ethernet/jme.c
+++ b/trunk/drivers/net/ethernet/jme.c
@@ -27,6 +27,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci-aspm.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
@@ -2973,6 +2974,9 @@ jme_init_one(struct pci_dev *pdev,
 	/*
 	 * set up PCI device basics
 	 */
+	pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S | PCIE_LINK_STATE_L1 |
+			       PCIE_LINK_STATE_CLKPM);
+
 	rc = pci_enable_device(pdev);
 	if (rc) {
 		pr_err("Cannot enable PCI device\n");