| Message ID | 20200109072735.GA22886@embeddedor |
|---|---|
| State | Accepted |
| Headers | show |
| Series | pwm: sun4i: Fix inconsistent IS_ERR and PTR_ERR | expand |
Hi Uwe, Gustavo, On Thu, 9 Jan 2020 at 08:44, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > Hello Gustavo, > > On Thu, Jan 09, 2020 at 01:27:35AM -0600, Gustavo A. R. Silva wrote: > > 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. Thanks for the catch. As these patches are still in next should we update them or apply a fix ? Regards, Clement > > > > 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> > > --- > > drivers/pwm/pwm-sun4i.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c > > index 1afd41ebd3fd..a805c347ee84 100644 > > --- a/drivers/pwm/pwm-sun4i.c > > +++ b/drivers/pwm/pwm-sun4i.c > > @@ -423,7 +423,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) > > How embarrassing that I didn't notice these. Thanks for catching. > > Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > > Best regards > Uwe > > -- > Pengutronix e.K. | Uwe Kleine-König | > Industrial Linux Solutions | https://www.pengutronix.de/ |
Hello, On Thu, Jan 09, 2020 at 10:14:00AM +0100, Clément Péron wrote: > On Thu, 9 Jan 2020 at 08:44, Uwe Kleine-König > <u.kleine-koenig@pengutronix.de> wrote: > > > > Hello Gustavo, > > > > On Thu, Jan 09, 2020 at 01:27:35AM -0600, Gustavo A. R. Silva wrote: > > > 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. > > Thanks for the catch. > > As these patches are still in next should we update them or apply a fix ? That's for Thierry to answer. Best regards Uwe
Hello, On Thu, Jan 09, 2020 at 01:27:35AM -0600, Gustavo A. R. Silva wrote: > 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> Patchwork seems to have missed my earlier reply with my Reviewed-by:. (https://patchwork.ozlabs.org/patch/1220206/ only has Clément's reply that still contains my quoted text, but obviously this wasn't picked up by patchwork.) So resending it in the hope this was a one-time miss: Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c index 1afd41ebd3fd..a805c347ee84 100644 --- a/drivers/pwm/pwm-sun4i.c +++ b/drivers/pwm/pwm-sun4i.c @@ -423,7 +423,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); @@ -432,7 +432,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); @@ -441,7 +441,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);
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> --- drivers/pwm/pwm-sun4i.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)