[PATCH 2/4] gpio: davinci: Handle the return value of davinci_gpio_irq_setup function
From: j-keerthy@ti.com (Keerthy)
Date: 2017-07-20 10:02:55
Also in:
linux-devicetree, linux-gpio, lkml
On Thursday 20 July 2017 03:20 PM, Johan Hovold wrote:
On Thu, Jul 20, 2017 at 02:40:37PM +0530, Keerthy wrote:quoted
On Thursday 20 July 2017 12:14 PM, Keerthy wrote:quoted
On Wednesday 19 July 2017 04:40 PM, Johan Hovold wrote:quoted
On Tue, Jul 18, 2017 at 04:27:14PM +0530, Keerthy wrote:quoted
Currently davinci_gpio_irq_setup return value is ignored. Handle the return value appropriately. Signed-off-by: Keerthy <j-keerthy@ti.com> --- drivers/gpio/gpio-davinci.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 2c88054..932f270 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c@@ -233,15 +233,23 @@ static int davinci_gpio_probe(struct platform_device *pdev) chips->regs[bank] = gpio_base + offset_array[bank]; ret = devm_gpiochip_add_data(dev, &chips->chip, chips); + if (ret) + goto err; + + platform_set_drvdata(pdev, chips); + ret = davinci_gpio_irq_setup(pdev); if (ret) { - ctrl_num = 0; - bank_base = 0; - return ret; + platform_set_drvdata(pdev, NULL); + goto err; } - platform_set_drvdata(pdev, chips); - davinci_gpio_irq_setup(pdev); return 0;There's a separate but related bug here too as the clk_prepare_enable() in davinci_gpio_irq_setup() is never balanced on driver unbind.Yes Johan. I will send that as a separate patch.This is already fixed in the latest kernel: commit 6dc0048cff988858254fcc26becfc1e9753efa79 Author: Arvind Yadav [off-list ref] Date: Tue May 23 14:48:57 2017 +0530That change only handles errors in davinci_gpio_irq_setup() (i.e. during probe) and not the imbalance at driver unbind that I was referring to.
Okay got it. One more clk_unprepare_disable() call needs to be there in probe err path.
Johan