From 5d46ce695c5b880e77612a80f6db8b761c56ae02 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 27 Aug 2010 00:46:57 -0300
Subject: [PATCH] --- yaml --- r: 215968 b: refs/heads/master c:
 86002324cf8809c72858741ab20bb7a855654b4c h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/edac/i7300_edac.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d6d96c2d29c..01e9f8342b00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5de6e07ed75ee29a302f50e149339ca747131121
+refs/heads/master: 86002324cf8809c72858741ab20bb7a855654b4c
diff --git a/trunk/drivers/edac/i7300_edac.c b/trunk/drivers/edac/i7300_edac.c
index e617b4f79dd8..f2f171d0356a 100644
--- a/trunk/drivers/edac/i7300_edac.c
+++ b/trunk/drivers/edac/i7300_edac.c
@@ -299,6 +299,11 @@ static void i7300_process_error_global(struct mem_ctl_info *mci,
 					ARRAY_SIZE(ferr_global_hi_name));
 		specific = GET_ERR_FROM_TABLE(ferr_global_hi_name, errnum);
 		is_fatal = ferr_global_hi_is_fatal(errnum);
+
+		/* Clear the error bit */
+		pci_write_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
+				       FERR_GLOBAL_HI, value);
+
 		goto error_global;
 	}
 
@@ -310,6 +315,11 @@ static void i7300_process_error_global(struct mem_ctl_info *mci,
 					ARRAY_SIZE(ferr_global_lo_name));
 		specific = GET_ERR_FROM_TABLE(ferr_global_lo_name, errnum);
 		is_fatal = ferr_global_lo_is_fatal(errnum);
+
+		/* Clear the error bit */
+		pci_write_config_dword(pvt->pci_dev_16_2_fsb_err_regs,
+				       FERR_GLOBAL_LO, value);
+
 		goto error_global;
 	}
 	return;