| Message ID | 20170129114052.GB7489@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 33e962c8871f015f5c8978384553dddcf5b81b22 |
| Delegated to: | Kalle Valo |
| Headers | show |
Stanislaw Gruszka <sgruszka@redhat.com> writes: > clk_get() takes two arguments and might return ERR_PTR(), so we > have to nullify pointer on that case, to do not break further call > to clk_get_rate(). > > Reported-by: Felix Fietkau <nbd@nbd.name> > Fixes: 34db70b92fae5 ("rt2x00: add copy of clk for soc devices") > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> The commit id looks wrong, I think it should be: Fixes: 34db70b92fae ("rt2x00: add copy of clk for soc devices") I can fix that during commit.
On Sun, Jan 29, 2017 at 04:53:38PM +0200, Kalle Valo wrote: > Stanislaw Gruszka <sgruszka@redhat.com> writes: > > > clk_get() takes two arguments and might return ERR_PTR(), so we > > have to nullify pointer on that case, to do not break further call > > to clk_get_rate(). > > > > Reported-by: Felix Fietkau <nbd@nbd.name> > > Fixes: 34db70b92fae5 ("rt2x00: add copy of clk for soc devices") > > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> > > The commit id looks wrong, I think it should be: > > Fixes: 34db70b92fae ("rt2x00: add copy of clk for soc devices") Yes, this one is correct. > I can fix that during commit. Please do, thanks. Stanislaw
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > clk_get() takes two arguments and might return ERR_PTR(), so we > have to nullify pointer on that case, to do not break further call > to clk_get_rate(). > > Reported-by: Felix Fietkau <nbd@nbd.name> > Fixes: 34db70b92fae ("rt2x00: add copy of clk for soc devices") > Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Patch applied to wireless-drivers-next.git, thanks. 33e962c8871f rt2x00: fix clk_get call
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c index 362f9d3..29250f7 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c @@ -92,7 +92,10 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops) rt2x00dev->hw = hw; rt2x00dev->irq = platform_get_irq(pdev, 0); rt2x00dev->name = pdev->dev.driver->name; - rt2x00dev->clk = clk_get(&pdev->dev); + + rt2x00dev->clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(rt2x00dev->clk)) + rt2x00dev->clk = NULL; rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
clk_get() takes two arguments and might return ERR_PTR(), so we have to nullify pointer on that case, to do not break further call to clk_get_rate(). Reported-by: Felix Fietkau <nbd@nbd.name> Fixes: 34db70b92fae5 ("rt2x00: add copy of clk for soc devices") Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> --- drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)