Skip to content

Commit 8cd5ba3

Browse files
author
Linus Walleij
committed
Merge tag 'samsung-pinctrl-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung into devel
Samsung pinctrl drivers changes for v6.14 Two fixes for very old issues around error handling and also one cleanup. Signed-off-by: Linus Walleij <[email protected]>
2 parents 2f0ffa5 + 0ebb1e9 commit 8cd5ba3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/pinctrl/samsung/pinctrl-exynos.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc)
636636
if (clk_enable(b->drvdata->pclk)) {
637637
dev_err(b->gpio_chip.parent,
638638
"unable to enable clock for pending IRQs\n");
639-
return;
639+
goto out;
640640
}
641641
}
642642

@@ -652,6 +652,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc)
652652
if (eintd->nr_banks)
653653
clk_disable(eintd->banks[0]->drvdata->pclk);
654654

655+
out:
655656
chained_irq_exit(chip, desc);
656657
}
657658

drivers/pinctrl/samsung/pinctrl-samsung.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,7 +1172,7 @@ static void samsung_banks_node_get(struct device *dev, struct samsung_pinctrl_dr
11721172
else
11731173
dev_warn(dev, "Missing node for bank %s - invalid DTB\n",
11741174
bank->name);
1175-
/* child reference dropped in samsung_drop_banks_of_node() */
1175+
/* child reference dropped in samsung_banks_node_put() */
11761176
}
11771177
}
11781178

@@ -1272,7 +1272,7 @@ static int samsung_pinctrl_probe(struct platform_device *pdev)
12721272

12731273
ret = platform_get_irq_optional(pdev, 0);
12741274
if (ret < 0 && ret != -ENXIO)
1275-
return ret;
1275+
goto err_put_banks;
12761276
if (ret > 0)
12771277
drvdata->irq = ret;
12781278

0 commit comments

Comments
 (0)