Skip to content

Commit cba8d3b

Browse files
GustavoARSilvathierryreding
authored andcommitted
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: b8d7464 ("pwm: sun4i: Prefer "mod" clock to unnamed") Fixes: 5b090b4 ("pwm: sun4i: Add an optional probe for bus clock") Signed-off-by: Gustavo A. R. Silva <[email protected]> Reviewed-by: Uwe Kleine-König <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 3e954d9 commit cba8d3b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/pwm/pwm-sun4i.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
422422
*/
423423
pwm->clk = devm_clk_get_optional(&pdev->dev, "mod");
424424
if (IS_ERR(pwm->clk)) {
425-
if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
425+
if (PTR_ERR(pwm->clk) != -EPROBE_DEFER)
426426
dev_err(&pdev->dev, "get mod clock failed %pe\n",
427427
pwm->clk);
428428
return PTR_ERR(pwm->clk);
@@ -431,7 +431,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
431431
if (!pwm->clk) {
432432
pwm->clk = devm_clk_get(&pdev->dev, NULL);
433433
if (IS_ERR(pwm->clk)) {
434-
if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
434+
if (PTR_ERR(pwm->clk) != -EPROBE_DEFER)
435435
dev_err(&pdev->dev, "get unnamed clock failed %pe\n",
436436
pwm->clk);
437437
return PTR_ERR(pwm->clk);
@@ -440,7 +440,7 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
440440

441441
pwm->bus_clk = devm_clk_get_optional(&pdev->dev, "bus");
442442
if (IS_ERR(pwm->bus_clk)) {
443-
if (PTR_ERR(pwm->rst) != -EPROBE_DEFER)
443+
if (PTR_ERR(pwm->bus_clk) != -EPROBE_DEFER)
444444
dev_err(&pdev->dev, "get bus clock failed %pe\n",
445445
pwm->bus_clk);
446446
return PTR_ERR(pwm->bus_clk);

0 commit comments

Comments
 (0)