x86 platform drivers: fix gpio leak

fef8ce16 · Libo Chen <[email protected]> · 2013-07-09 20:34:28 +08:00

when request_irq fails, we should release gpiochip

v2:
  fix warning: ignoring return value of 'gpiochip_remove

Signed-off-by: Libo Chen <[email protected]>
Signed-off-by: Matthew Garrett <[email protected]>

Commit: fef8ce166b2d5cdba8bbf85fa48c4cb8d75ffec4
Parents: 283672e4

Changes

1 files changed · +5 −1

File	Status	Add	Del	Content
drivers/platform/x86/intel_pmic_gpio.c	modified	+5	−1	View file

drivers/platform/x86/intel_pmic_gpio.c

View file

diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c
index 6f4b728..2805988 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: