From 59af2c4e8454ac6c722eb78731e62cd978f6d763 Mon Sep 17 00:00:00 2001
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Date: Fri, 15 Apr 2011 19:23:11 +0400
Subject: [PATCH] --- yaml --- r: 246943 b: refs/heads/master c:
 0477ad72a12d4ee3f588de9349012948ea25702b h: refs/heads/master i:   246941:
 1bc65c46fdc65282972a51a639b4a1098b7fd1fd   246939:
 73615cee1ce53820f74ac44e44b31c69c6987435   246935:
 3474d419d4fef3f7dbb9dbbacd51e6e2b36527e6   246927:
 583dbe30f8c463c51dc77e017654cd0d698da6aa   246911:
 83fdc1098eff8c3383cee8152fb69726611264f7 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9369adab39b9..6933cc2b8658 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5facc75fa9104f074c4610437a9c717c9e5ecde
+refs/heads/master: 0477ad72a12d4ee3f588de9349012948ea25702b
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c b/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
index 91b3d8b9d7a5..dd90619fdce7 100644
--- a/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
+++ b/trunk/drivers/net/wireless/iwlegacy/iwl4965-base.c
@@ -3179,7 +3179,7 @@ static void iwl4965_hw_detect(struct iwl_priv *priv)
 {
 	priv->hw_rev = _iwl_legacy_read32(priv, CSR_HW_REV);
 	priv->hw_wa_rev = _iwl_legacy_read32(priv, CSR_HW_REV_WA_REG);
-	pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &priv->rev_id);
+	priv->rev_id = priv->pci_dev->revision;
 	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", priv->rev_id);
 }