From e04ababe3ee8844a447d28176af2df99dae93275 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 3 Jun 2013 02:08:39 +0000
Subject: [PATCH] --- yaml --- r: 376767 b: refs/heads/master c:
 a98d4f64a20b2b88697e7e08c871144a7e3f0ec4 h: refs/heads/master i:   376765:
 a721c058686b722a32ab8a5c8209bcc72fe03925   376763:
 b5d22372f4faeb57296257a42c8be08ed3eb4ef0   376759:
 a3926477dc666e5f64011dd8736e8205848d8fd8   376751:
 74a18bab75b54cdb2c8983491b417fe3f19d182f   376735:
 60eb624c906736ec98594a70bbe7eda361ed490d   376703:
 5e17a506a10012422591047a00596acba28f1c6e v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/apei/ghes.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 20816ee2ca88..cb81d497c31f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 780a6ec640a3fed671fc2c40e4dd30c03eca3ac3
+refs/heads/master: a98d4f64a20b2b88697e7e08c871144a7e3f0ec4
diff --git a/trunk/drivers/acpi/apei/ghes.c b/trunk/drivers/acpi/apei/ghes.c
index d668a8ae602b..ea750ed7c264 100644
--- a/trunk/drivers/acpi/apei/ghes.c
+++ b/trunk/drivers/acpi/apei/ghes.c
@@ -917,13 +917,14 @@ static int ghes_probe(struct platform_device *ghes_dev)
 		break;
 	case ACPI_HEST_NOTIFY_EXTERNAL:
 		/* External interrupt vector is GSI */
-		if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) {
+		rc = acpi_gsi_to_irq(generic->notify.vector, &ghes->irq);
+		if (rc) {
 			pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n",
 			       generic->header.source_id);
 			goto err_edac_unreg;
 		}
-		if (request_irq(ghes->irq, ghes_irq_func,
-				0, "GHES IRQ", ghes)) {
+		rc = request_irq(ghes->irq, ghes_irq_func, 0, "GHES IRQ", ghes);
+		if (rc) {
 			pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
 			       generic->header.source_id);
 			goto err_edac_unreg;