Merge tag 'configfs-5.15' of git://git.infradead.org/users/hch/configfs

[linux-2.6-microblaze.git] / sound / soc / fsl / fsl_rpmsg.c

diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c
index ea5c973..d60f4da 100644 (file)
--- a/sound/soc/fsl/fsl_rpmsg.c
+++ b/sound/soc/fsl/fsl_rpmsg.c
@@ -165,25 +165,25 @@ static int fsl_rpmsg_probe(struct platform_device *pdev)
        }
 
        /* Get the optional clocks */
-       rpmsg->ipg = devm_clk_get(&pdev->dev, "ipg");
+       rpmsg->ipg = devm_clk_get_optional(&pdev->dev, "ipg");
        if (IS_ERR(rpmsg->ipg))
-               rpmsg->ipg = NULL;
+               return PTR_ERR(rpmsg->ipg);
 
-       rpmsg->mclk = devm_clk_get(&pdev->dev, "mclk");
+       rpmsg->mclk = devm_clk_get_optional(&pdev->dev, "mclk");
        if (IS_ERR(rpmsg->mclk))
-               rpmsg->mclk = NULL;
+               return PTR_ERR(rpmsg->mclk);
 
-       rpmsg->dma = devm_clk_get(&pdev->dev, "dma");
+       rpmsg->dma = devm_clk_get_optional(&pdev->dev, "dma");
        if (IS_ERR(rpmsg->dma))
-               rpmsg->dma = NULL;
+               return PTR_ERR(rpmsg->dma);
 
-       rpmsg->pll8k = devm_clk_get(&pdev->dev, "pll8k");
+       rpmsg->pll8k = devm_clk_get_optional(&pdev->dev, "pll8k");
        if (IS_ERR(rpmsg->pll8k))
-               rpmsg->pll8k = NULL;
+               return PTR_ERR(rpmsg->pll8k);
 
-       rpmsg->pll11k = devm_clk_get(&pdev->dev, "pll11k");
+       rpmsg->pll11k = devm_clk_get_optional(&pdev->dev, "pll11k");
        if (IS_ERR(rpmsg->pll11k))
-               rpmsg->pll11k = NULL;
+               return PTR_ERR(rpmsg->pll11k);
 
        platform_set_drvdata(pdev, rpmsg);
        pm_runtime_enable(&pdev->dev);