From 6f8a5fd88abf5270b3da7c6c91ffe248a0049bdb Mon Sep 17 00:00:00 2001
From: Jeff Haran <jharan@Brocade.COM>
Date: Mon, 13 Apr 2009 14:40:20 -0700
Subject: [PATCH] --- yaml --- r: 143231 b: refs/heads/master c:
 e6da46b273443c8cebef81a68b2d0d955b8a07b4 h: refs/heads/master i:   143229:
 02e082575f674586d1a1d1ed7cc907d43eb1b177   143227:
 f8d89e4f8a3e76718cbe3f905d2f3d70e0994217   143223:
 23badc7aff23829ae0c3212fba1ba3638531788b   143215:
 25ca25f124c7e037fdda1da71633903233ac2d69   143199:
 2fd29d58bde978fed37714c38b8481f96199b290   143167:
 33c2371f99222d48bae74dfa1bf35f0ad7e8e6a2   143103:
 407516816a571f20e363eb02b9e9f457bee74af8 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/edac/edac_core.h | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f39b0fb4492b..a459918e7f95 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7665b0a380585fbd70a2275f3120c6086e0c92d
+refs/heads/master: e6da46b273443c8cebef81a68b2d0d955b8a07b4
diff --git a/trunk/drivers/edac/edac_core.h b/trunk/drivers/edac/edac_core.h
index 28f2c3f959b5..6ad95c8d6363 100644
--- a/trunk/drivers/edac/edac_core.h
+++ b/trunk/drivers/edac/edac_core.h
@@ -767,11 +767,19 @@ static inline void pci_write_bits16(struct pci_dev *pdev, int offset,
 	pci_write_config_word(pdev, offset, value);
 }
 
-/* write all or some bits in a dword-register*/
+/*
+ * pci_write_bits32
+ *
+ * edac local routine to do pci_write_config_dword, but adds
+ * a mask parameter. If mask is all ones, ignore the mask.
+ * Otherwise utilize the mask to isolate specified bits
+ *
+ * write all or some bits in a dword-register
+ */
 static inline void pci_write_bits32(struct pci_dev *pdev, int offset,
 				    u32 value, u32 mask)
 {
-	if (mask != 0xffff) {
+	if (mask != 0xffffffff) {
 		u32 buf;
 
 		pci_read_config_dword(pdev, offset, &buf);