Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef8ce16 authored by Libo Chen's avatar Libo Chen Committed by Matthew Garrett
Browse files

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: default avatarLibo Chen <libo.chen@huawei.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent 283672e4

drivers/platform/x86/intel_pmic_gpio.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -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);

	retval = request_irq(pg->irq, pmic_irq_handler, 0, "pmic", pg);

	if (retval) {

	if (retval) {

		pr_warn("Interrupt request failed\n");

		pr_warn("Interrupt request failed\n");

		goto err;

		goto fail_request_irq;

	}

	}





	for (i = 0; i < 8; i++) {

	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);

		irq_set_chip_data(i + pg->irq_base, pg);

	}

	}

	return 0;

	return 0;



fail_request_irq:

	if (gpiochip_remove(&pg->chip))

		pr_err("gpiochip_remove failed\n");

err:

err:

	iounmap(pg->gpiointr);

	iounmap(pg->gpiointr);

err2:

err2: