]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
media: v4l: cadence: Handle errors of clk_prepare_enable()
authorEvgeny Novikov <novikov@ispras.ru>
Tue, 18 May 2021 18:57:22 +0000 (20:57 +0200)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Wed, 2 Jun 2021 12:04:35 +0000 (14:04 +0200)
Handle errors of clk_prepare_enable() in csi2rx_get_resources().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/cadence/cdns-csi2rx.c

index c68a3eac62cdd8947f7c3b01953d66b3e666ead3..f2b4ddd31177b8dca142c15aaf5734bd0a346177 100644 (file)
@@ -282,6 +282,7 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
        struct resource *res;
        unsigned char i;
        u32 dev_cfg;
+       int ret;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        csi2rx->base = devm_ioremap_resource(&pdev->dev, res);
@@ -315,7 +316,12 @@ static int csi2rx_get_resources(struct csi2rx_priv *csi2rx,
                return -EINVAL;
        }
 
-       clk_prepare_enable(csi2rx->p_clk);
+       ret = clk_prepare_enable(csi2rx->p_clk);
+       if (ret) {
+               dev_err(&pdev->dev, "Couldn't prepare and enable P clock\n");
+               return ret;
+       }
+
        dev_cfg = readl(csi2rx->base + CSI2RX_DEVICE_CFG_REG);
        clk_disable_unprepare(csi2rx->p_clk);