Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9804049097af11b4f64a82b0e8c8078b3f2cbada

Authored by Axel Lin
Committed by Linus Walleij
1 parent 6f37b1b4d4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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 <axel.lin@ingics.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/pinctrl/spear/pinctrl-plgpio.c
Diff comments   View file @ 9804049
... ... @@ -243,7 +243,8 @@
243 243 return 0;
244 244  
245 245 err1:
246   - clk_disable_unprepare(plgpio->clk);
  246 + if (!IS_ERR(plgpio->clk))
  247 + clk_disable_unprepare(plgpio->clk);
247 248 err0:
248 249 pinctrl_free_gpio(gpio);
249 250 return ret;