lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 382/917] media: imx258: Fix getting clock frequency
    Date
    From: Sakari Ailus <sakari.ailus@linux.intel.com>

    [ Upstream commit d170b0ea1760989fe8ac053bef83e61f3bf87992 ]

    Obtain the clock frequency by reading the clock-frequency property if
    there's no clock.

    Fixes: 9fda25332c4b ("media: i2c: imx258: get clock from device properties and enable it via runtime PM")
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/imx258.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c
    index 81cdf37216ca7..c249507aa2dbc 100644
    --- a/drivers/media/i2c/imx258.c
    +++ b/drivers/media/i2c/imx258.c
    @@ -1260,18 +1260,18 @@ static int imx258_probe(struct i2c_client *client)
    return -ENOMEM;

    imx258->clk = devm_clk_get_optional(&client->dev, NULL);
    + if (IS_ERR(imx258->clk))
    + return dev_err_probe(&client->dev, PTR_ERR(imx258->clk),
    + "error getting clock\n");
    if (!imx258->clk) {
    dev_dbg(&client->dev,
    "no clock provided, using clock-frequency property\n");

    device_property_read_u32(&client->dev, "clock-frequency", &val);
    - if (val != IMX258_INPUT_CLOCK_FREQ)
    - return -EINVAL;
    - } else if (IS_ERR(imx258->clk)) {
    - return dev_err_probe(&client->dev, PTR_ERR(imx258->clk),
    - "error getting clock\n");
    + } else {
    + val = clk_get_rate(imx258->clk);
    }
    - if (clk_get_rate(imx258->clk) != IMX258_INPUT_CLOCK_FREQ) {
    + if (val != IMX258_INPUT_CLOCK_FREQ) {
    dev_err(&client->dev, "input clock frequency not supported\n");
    return -EINVAL;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:56    [W:4.093 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site