aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/apei/ghes.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-07 06:35:23 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-07 06:35:23 -0400
commit2314b69253a42f8814cd6e3830b8538b815f1c11 (patch)
tree5113d59410630b78c37bebd513e0f7fe9391e710 /drivers/acpi/apei/ghes.c
parentd683b96b072dc4680fc74964eca77e6a23d1fa6e (diff)
parent7cd8407d53ef5fb0280fcbe34f42311472f90feb (diff)
Merge branch 'acpi-fixes'
* acpi-fixes: ACPI / PM: Do not execute _PS0 for devices without _PSC during initialization ACPI / scan: do not match drivers against objects having scan handlers ACPI / APEI: fix error return code in ghes_probe() ACPI / video: ignore BIOS initial backlight value for HP Pavilion g6 ACPI / video: ignore BIOS initial backlight value for HP m4 x86 / platform / hp_wmi: Fix bluetooth_rfkill misuse in hp_wmi_rfkill_setup()
Diffstat (limited to 'drivers/acpi/apei/ghes.c')
-rw-r--r--drivers/acpi/apei/ghes.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 403baf4dffc1..fcd7d91cec34 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -919,13 +919,14 @@ static int ghes_probe(struct platform_device *ghes_dev)
919 break; 919 break;
920 case ACPI_HEST_NOTIFY_EXTERNAL: 920 case ACPI_HEST_NOTIFY_EXTERNAL:
921 /* External interrupt vector is GSI */ 921 /* External interrupt vector is GSI */
922 if (acpi_gsi_to_irq(generic->notify.vector, &ghes->irq)) { 922 rc = acpi_gsi_to_irq(generic->notify.vector, &ghes->irq);
923 if (rc) {
923 pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n", 924 pr_err(GHES_PFX "Failed to map GSI to IRQ for generic hardware error source: %d\n",
924 generic->header.source_id); 925 generic->header.source_id);
925 goto err_edac_unreg; 926 goto err_edac_unreg;
926 } 927 }
927 if (request_irq(ghes->irq, ghes_irq_func, 928 rc = request_irq(ghes->irq, ghes_irq_func, 0, "GHES IRQ", ghes);
928 0, "GHES IRQ", ghes)) { 929 if (rc) {
929 pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n", 930 pr_err(GHES_PFX "Failed to register IRQ for generic hardware error source: %d\n",
930 generic->header.source_id); 931 generic->header.source_id);
931 goto err_edac_unreg; 932 goto err_edac_unreg;