]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: i2c: ov6650: Use the v4l2 helper for obtaining the clock
authorMehdi Djait <mehdi.djait@linux.intel.com>
Thu, 26 Jun 2025 13:34:25 +0000 (15:34 +0200)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Wed, 13 Aug 2025 13:10:25 +0000 (15:10 +0200)
devm_clk_get() fails on ACPI-based platforms, where firmware does not
provide a direct reference to the clock producer.

Replace devm_clk_get() with the new v4l2 helper
devm_v4l2_sensor_clk_get() that works on both DT- and ACPI-based
platforms to retrieve a reference to the clock producer from firmware.

Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mehdi Djait <mehdi.djait@linux.intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/i2c/ov6650.c

index 9c76271611422c9339d5090ee93acebe1487d207..3e37a6436aebe8889e41f0d1f96e6390c098c82f 100644 (file)
@@ -898,12 +898,10 @@ static int ov6650_video_probe(struct v4l2_subdev *sd)
        u8 pidh, pidl, midh, midl;
        int i, ret = 0;
 
-       priv->clk = devm_clk_get(&client->dev, NULL);
-       if (IS_ERR(priv->clk)) {
-               ret = PTR_ERR(priv->clk);
-               dev_err(&client->dev, "clk request err: %d\n", ret);
-               return ret;
-       }
+       priv->clk = devm_v4l2_sensor_clk_get(&client->dev, NULL);
+       if (IS_ERR(priv->clk))
+               return dev_err_probe(&client->dev, PTR_ERR(priv->clk),
+                                    "clk request err\n");
 
        rate = clk_get_rate(priv->clk);
        for (i = 0; rate && i < ARRAY_SIZE(ov6650_xclk); i++) {