pinctrl: plgpio: Call clk_disable_unprepare only if clk_prepare_enable is called

PATCH In review Axel Lin 3 participants 3 messages Nov 14, 2012 – Nov 15, 2012

Subsystems (2)

Pin control Spear platform/clock/pinctrl support

lore

Share & tools

lore

Axel Lin

author

2012-11-14 08:37 UTC #0 lore raw

PATCH 1/1 pinctrl: plgpio: Call clk_disable_unprepare only if clk_prepare_enable is called

This driver allows clk_get() failure, and still work without it. This patch adds !IS_ERR(plgpio->clk) checking in plgpio_request() error path so we only call clk_disable_unprepare() if clk_prepare_enable() is called.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/pinctrl/spear/pinctrl-plgpio.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

drivers/pinctrl/spear/pinctrl-plgpio.c +2 -1

index 1044ad3..cf6d9c2 100644
@@ -243,7 +243,8 @@ static int plgpio_request(struct gpio_chip *chip, unsigned offset)
 	return 0;
 
 err1:
-	clk_disable_unprepare(plgpio->clk);
+	if (!IS_ERR(plgpio->clk))
+		clk_disable_unprepare(plgpio->clk);
 err0:
 	pinctrl_free_gpio(gpio);
 	return ret;

Signature · 1 line

1.7.9.5

Viresh Kumar

Acked-by on v1 1/1

2012-11-14 09:06 UTC #1 lore raw

Quoted 5 lines · Axel Lin

This driver allows clk_get() failure, and still work without it. This patch adds !IS_ERR(plgpio->clk) checking in plgpio_request() error path so we only call clk_disable_unprepare() if clk_prepare_enable() is called.
Signed-off-by Axel Lin <[email protected]>

Acked-by Viresh Kumar <[email protected]>

Linus Walleij

2012-11-15 11:34 UTC #2 lore raw

In reply to Axel Lin

Quoted 5 lines · Axel Lin

This driver allows clk_get() failure, and still work without it. This patch adds !IS_ERR(plgpio->clk) checking in plgpio_request() error path so we only call clk_disable_unprepare() if clk_prepare_enable() is called.
Signed-off-by Axel Lin <[email protected]>

Applied with Viresh's ACK, thanks!

Yours,
Linus Walleij