Commit 33e962c8 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo

rt2x00: fix clk_get call

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: default avatarFelix Fietkau <nbd@nbd.name>
Fixes: 34db70b9 ("rt2x00: add copy of clk for soc devices")
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 575ddce0
...@@ -92,7 +92,10 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops) ...@@ -92,7 +92,10 @@ int rt2x00soc_probe(struct platform_device *pdev, const struct rt2x00_ops *ops)
rt2x00dev->hw = hw; rt2x00dev->hw = hw;
rt2x00dev->irq = platform_get_irq(pdev, 0); rt2x00dev->irq = platform_get_irq(pdev, 0);
rt2x00dev->name = pdev->dev.driver->name; 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); rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment