From c99fc19cf8134a198c7be0640389181237baa1b8 Mon Sep 17 00:00:00 2001
From: Jiang Liu <jiang.liu@huawei.com>
Date: Tue, 24 Jul 2012 17:20:33 +0800
Subject: [PATCH] --- yaml --- r: 324199 b: refs/heads/master c:
 479e0d485eaab452cf248cd1a9520015023b35b2 h: refs/heads/master i:   324197:
 87257e9bd7f4511242831e2ac2c73e54b1bd90be   324195:
 ef3c64bca671ad0b8542d22337c668b0fe9d1084   324191:
 d23d364080d5f30c3c06df26724fe516fbea4a6c v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3dde4dec7e28..598bde864a55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 532c5f69e223ec846511fa4a14fa1fc8bca142a2
+refs/heads/master: 479e0d485eaab452cf248cd1a9520015023b35b2
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
index ddadcc3e4e7c..5abbee37cdca 100644
--- a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
+++ b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c
@@ -31,12 +31,10 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev,
 	struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
 	u8 tmp;
-	int pos;
-	u8 LinkCtrlReg;
+	u16 LinkCtrlReg;
 
-	pos = pci_find_capability(priv->pdev, PCI_CAP_ID_EXP);
-	pci_read_config_byte(priv->pdev, pos + PCI_EXP_LNKCTL, &LinkCtrlReg);
-	priv->NdisAdapter.LinkCtrlReg = LinkCtrlReg;
+	pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &LinkCtrlReg);
+	priv->NdisAdapter.LinkCtrlReg = (u8)LinkCtrlReg;
 
 	RT_TRACE(COMP_INIT, "Link Control Register =%x\n",
 		 priv->NdisAdapter.LinkCtrlReg);