OSDN Git Service

media: driver/nxp/imx-jpeg: fix a unexpected return value problem
authorJian Zhang <zhangjian210@huawei.com>
Mon, 20 Jun 2022 08:34:23 +0000 (09:34 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Mon, 27 Jun 2022 08:23:34 +0000 (09:23 +0100)
In function mxc_jpeg_probe(), when devm_clk_get() fail, the return value
will be unexpected, and it should be the devm_clk_get's error code.

Fixes: 4c2e5156d9fa6 ("media: imx-jpeg: Add pm-runtime support for imx-jpeg")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Jian Zhang <zhangjian210@huawei.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c

index c65d480..32fd04a 100644 (file)
@@ -2205,12 +2205,14 @@ static int mxc_jpeg_probe(struct platform_device *pdev)
        jpeg->clk_ipg = devm_clk_get(dev, "ipg");
        if (IS_ERR(jpeg->clk_ipg)) {
                dev_err(dev, "failed to get clock: ipg\n");
+               ret = PTR_ERR(jpeg->clk_ipg);
                goto err_clk;
        }
 
        jpeg->clk_per = devm_clk_get(dev, "per");
        if (IS_ERR(jpeg->clk_per)) {
                dev_err(dev, "failed to get clock: per\n");
+               ret = PTR_ERR(jpeg->clk_per);
                goto err_clk;
        }