summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibo Chen <clbchenlibo.chen@huawei.com>2013-07-09 14:34:28 +0200
committerMatthew Garrett <matthew.garrett@nebula.com>2013-07-10 21:42:51 +0200
commitfef8ce166b2d5cdba8bbf85fa48c4cb8d75ffec4 (patch)
tree50eb445157b91520524ad9f7ef9c6b890c185332
parenttoshiba_acpi: Add dependency on SERIO_I8042 (diff)
downloadlinux-fef8ce166b2d5cdba8bbf85fa48c4cb8d75ffec4.tar.xz
linux-fef8ce166b2d5cdba8bbf85fa48c4cb8d75ffec4.zip
x86 platform drivers: fix gpio leak
when request_irq fails, we should release gpiochip v2: fix warning: ignoring return value of 'gpiochip_remove Signed-off-by: Libo Chen <libo.chen@huawei.com> Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
-rw-r--r--drivers/platform/x86/intel_pmic_gpio.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 6f4b7289a059..2805988485f6 100644
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
@@ -288,7 +288,7 @@ static int platform_pmic_gpio_probe(struct platform_device *pdev)
retval = request_irq(pg->irq, pmic_irq_handler, 0, "pmic", pg);
if (retval) {
pr_warn("Interrupt request failed\n");
- goto err;
+ goto fail_request_irq;
}
for (i = 0; i < 8; i++) {
@@ -299,6 +299,10 @@ static int platform_pmic_gpio_probe(struct platform_device *pdev)
irq_set_chip_data(i + pg->irq_base, pg);
}
return 0;
+
+fail_request_irq:
+ if (gpiochip_remove(&pg->chip))
+ pr_err("gpiochip_remove failed\n");
err:
iounmap(pg->gpiointr);
err2: