lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: c6ce2b6bff ("gpio: add TB10x GPIO driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2023-09-03 08:13:21 +02:00 committed by Greg Kroah-Hartman
parent 02a233986c
commit e09db461f2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpio/gpio-tb10x.c
View File

@ -195,7 +195,7 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE, handle_edge_irq, IRQ_NOREQUEST, IRQ_NOPROBE,
IRQ_GC_INIT_MASK_CACHE); IRQ_GC_INIT_MASK_CACHE);
if (ret) if (ret)
return ret; goto err_remove_domain;
gc = tb10x_gpio->domain->gc->gc[0]; gc = tb10x_gpio->domain->gc->gc[0];
gc->reg_base = tb10x_gpio->base; gc->reg_base = tb10x_gpio->base;
@ -209,6 +209,10 @@ static int tb10x_gpio_probe(struct platform_device *pdev)
} }
return 0; return 0;
err_remove_domain:
irq_domain_remove(tb10x_gpio->domain);
return ret;
} }
static int tb10x_gpio_remove(struct platform_device *pdev) static int tb10x_gpio_remove(struct platform_device *pdev)