aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorGustavo A. R. Silva <gustavo@embeddedor.com>2020-01-09 01:27:35 -0600
committerThierry Reding <thierry.reding@gmail.com>2020-01-20 13:19:50 +0100
commitcba8d3bfdc967561b1c953f67d2053d526ae1f88 (patch)
tree7c5ef17f08bd261fcce6b3ecb0a28876ff2ec9af /drivers/pwm
parentpwm: sun4i: Move pwm_calculate() out of spin_lock() (diff)
downloadlinux-dev-cba8d3bfdc967561b1c953f67d2053d526ae1f88.tar.xz
linux-dev-cba8d3bfdc967561b1c953f67d2053d526ae1f88.zip
pwm: sun4i: Fix inconsistent IS_ERR and PTR_ERR
Fix inconsistent IS_ERR and PTR_ERR in sun4i_pwm_probe(). The proper pointers to be passed as arguments are pwm->clk and pwm->bus_clk. This bug was detected with the help of Coccinelle. Fixes: b8d74644f34a ("pwm: sun4i: Prefer "mod" clock to unnamed") Fixes: 5b090b430d75 ("pwm: sun4i: Add an optional probe for bus clock") Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com> Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-sun4i.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
index 6b230029dc49..a573e9d147c2 100644
--- a/drivers/pwm/pwm-sun4i.c
+++ b/drivers/pwm/pwm-sun4i.c
@@ -422,7 +422,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
*/
pwm->clk = devm_clk_get_optional(&pdev->dev, "mod");
if (IS_ERR(pwm->clk)) {
- if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
+ if (PTR_ERR(pwm->clk) != -EPROBE_DEFER)
dev_err(&pdev->dev, "get mod clock failed %pe\n",
pwm->clk);
return PTR_ERR(pwm->clk);
@@ -431,7 +431,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
if (!pwm->clk) {
pwm->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(pwm->clk)) {
- if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
+ if (PTR_ERR(pwm->clk) != -EPROBE_DEFER)
dev_err(&pdev->dev, "get unnamed clock failed %pe\n",
pwm->clk);
return PTR_ERR(pwm->clk);
@@ -440,7 +440,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
pwm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus");
if (IS_ERR(pwm->bus_clk)) {
- if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
+ if (PTR_ERR(pwm->bus_clk) != -EPROBE_DEFER)
dev_err(&pdev->dev, "get bus clock failed %pe\n",
pwm->bus_clk);
return PTR_ERR(pwm->bus_clk);