diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-03 02:08:39 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-05 13:11:47 +0200 |
| commit | a98d4f64a20b2b88697e7e08c871144a7e3f0ec4 (patch) | |
| tree | 1107c02d00d96c24df3cbb3f69622e4631cfdeaa /drivers/acpi | |
| parent | 780a6ec640a3fed671fc2c40e4dd30c03eca3ac3 (diff) | |
| download | linux-3.10-a98d4f64a20b2b88697e7e08c871144a7e3f0ec4.tar.gz linux-3.10-a98d4f64a20b2b88697e7e08c871144a7e3f0ec4.tar.bz2 linux-3.10-a98d4f64a20b2b88697e7e08c871144a7e3f0ec4.zip | |
ACPI / APEI: fix error return code in ghes_probe()
Fix to return a negative error code in the acpi_gsi_to_irq() and
request_irq() error handling case instead of 0, as done elsewhere
in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Huang Ying <ying.huang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/apei/ghes.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index d668a8ae602..ea750ed7c26 100644 --- a/drivers/acpi/apei/ghes.c +++ b/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; |