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

Commit e09db461 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() 



[ Upstream commit b547b5e52a0587e6b25ea520bf2f9e03d00cbcb6 ]

If an error occurs after a successful irq_domain_add_linear() call, it
should be undone by a corresponding irq_domain_remove(), as already done
in the remove function.

Fixes: c6ce2b6b ("gpio: add TB10x GPIO driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 02a23398

drivers/gpio/gpio-tb10x.c

+5 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev) 
				handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE,

				IRQ_GC_INIT_MASK_CACHE);

		if (ret)

			return ret;

			goto err_remove_domain;



		gc = tb10x_gpio->domain->gc->gc[0];

		gc->reg_base                         = tb10x_gpio->base;
@@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev) 
	}



	return 0;



err_remove_domain:

	irq_domain_remove(tb10x_gpio->domain);

	return ret;

}



static int tb10x_gpio_remove(struct platform_device *pdev)