2018-06-02 07:54:50

by Dan Carpenter

Subject: [PATCH] clk: davinci: cfgchip: testing the wrong variable

There is a copy and paste bug here. We should be testing "usb1" instead
of "usb0".

Fixes: 58e1e2d2cd89 ("clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks")
Signed-off-by: Dan Carpenter <[email protected]>

diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
index c971111d2601..20a120aa147e 100644
--- a/drivers/clk/davinci/da8xx-cfgchip.c
+++ b/drivers/clk/davinci/da8xx-cfgchip.c
@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)

usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
if (IS_ERR(usb1)) {
- if (PTR_ERR(usb0) == -EPROBE_DEFER)
+ if (PTR_ERR(usb1) == -EPROBE_DEFER)
return -EPROBE_DEFER;

dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",

2018-06-02 14:33:44

by David Lechner

Subject: Re: [PATCH] clk: davinci: cfgchip: testing the wrong variable

On 06/02/2018 02:52 AM, Dan Carpenter wrote:
> There is a copy and paste bug here. We should be testing "usb1" instead
> of "usb0".
>
> Fixes: 58e1e2d2cd89 ("clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks")
> Signed-off-by: Dan Carpenter <[email protected]>
>
> diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
> index c971111d2601..20a120aa147e 100644
> --- a/drivers/clk/davinci/da8xx-cfgchip.c
> +++ b/drivers/clk/davinci/da8xx-cfgchip.c
> @@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
>
> usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
> if (IS_ERR(usb1)) {
> - if (PTR_ERR(usb0) == -EPROBE_DEFER)
> + if (PTR_ERR(usb1) == -EPROBE_DEFER)
> return -EPROBE_DEFER;
>
> dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
>

Reviewed-by: David Lechner <[email protected]>

2018-06-25 23:18:56

by David Lechner

Subject: Re: [PATCH] clk: davinci: cfgchip: testing the wrong variable

On 06/02/2018 02:52 AM, Dan Carpenter wrote:
> There is a copy and paste bug here. We should be testing "usb1" instead
> of "usb0".
>
> Fixes: 58e1e2d2cd89 ("clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks")
> Signed-off-by: Dan Carpenter <[email protected]>
>
> diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
> index c971111d2601..20a120aa147e 100644
> --- a/drivers/clk/davinci/da8xx-cfgchip.c
> +++ b/drivers/clk/davinci/da8xx-cfgchip.c
> @@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
>
> usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
> if (IS_ERR(usb1)) {
> - if (PTR_ERR(usb0) == -EPROBE_DEFER)
> + if (PTR_ERR(usb1) == -EPROBE_DEFER)
> return -EPROBE_DEFER;
>
> dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
>

Applied to https://github.com/dlech/linux/tree/clk-davinci-fixes

Thanks.

2018-06-25 23:34:09

by Stephen Boyd

Subject: Re: [PATCH] clk: davinci: cfgchip: testing the wrong variable

Quoting David Lechner (2018-06-25 16:17:55)
> On 06/02/2018 02:52 AM, Dan Carpenter wrote:
> > There is a copy and paste bug here. We should be testing "usb1" instead
> > of "usb0".
> >
> > Fixes: 58e1e2d2cd89 ("clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks")
> > Signed-off-by: Dan Carpenter <[email protected]>
> >
> > diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
> > index c971111d2601..20a120aa147e 100644
> > --- a/drivers/clk/davinci/da8xx-cfgchip.c
> > +++ b/drivers/clk/davinci/da8xx-cfgchip.c
> > @@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
> >
> > usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
> > if (IS_ERR(usb1)) {
> > - if (PTR_ERR(usb0) == -EPROBE_DEFER)
> > + if (PTR_ERR(usb1) == -EPROBE_DEFER)
> > return -EPROBE_DEFER;
> >
> > dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
> >
>
> Applied to https://github.com/dlech/linux/tree/clk-davinci-fixes
>

Ok. I expect this will be coming in a PR soon? Usually I can pick up
fixes just fine from the list and merge them on up to Linus, unless you
feel the need to pick it into your development tree to base future
development on.

2018-06-25 23:58:28

by David Lechner

Subject: Re: [PATCH] clk: davinci: cfgchip: testing the wrong variable

On 06/25/2018 06:33 PM, Stephen Boyd wrote:
> Quoting David Lechner (2018-06-25 16:17:55)
>> On 06/02/2018 02:52 AM, Dan Carpenter wrote:
>>> There is a copy and paste bug here. We should be testing "usb1" instead
>>> of "usb0".
>>>
>>> Fixes: 58e1e2d2cd89 ("clk: davinci: cfgchip: Add TI DA8XX USB PHY clocks")
>>> Signed-off-by: Dan Carpenter <[email protected]>
>>>
>>> diff --git a/drivers/clk/davinci/da8xx-cfgchip.c b/drivers/clk/davinci/da8xx-cfgchip.c
>>> index c971111d2601..20a120aa147e 100644
>>> --- a/drivers/clk/davinci/da8xx-cfgchip.c
>>> +++ b/drivers/clk/davinci/da8xx-cfgchip.c
>>> @@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
>>>
>>> usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
>>> if (IS_ERR(usb1)) {
>>> - if (PTR_ERR(usb0) == -EPROBE_DEFER)
>>> + if (PTR_ERR(usb1) == -EPROBE_DEFER)
>>> return -EPROBE_DEFER;
>>>
>>> dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
>>>
>>
>> Applied to https://github.com/dlech/linux/tree/clk-davinci-fixes
>>
>
> Ok. I expect this will be coming in a PR soon? Usually I can pick up
> fixes just fine from the list and merge them on up to Linus, unless you
> feel the need to pick it into your development tree to base future
> development on.
>

Yes, in a few minutes actually. I have never done a PR via email before,
so I figured this would be a good way to learn with a few small patches.

I know everyone is always busy, so of course, if I'm making more work for
you, I'll be glad to do it differently.

And I'll keep this in mind for future fixes.