Commit 73b41dc5 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: ov5670: Fix probe on ACPI

devm_clk_get() will return either an error or NULL, which the driver
handles, continuing to use the clock of reading the value of the
clock-frequency property.

However, the value of ov5670->xvclk is left as-is and the other clock
framework functions aren't capable of handling error values.

Use devm_clk_get_optional() to obtain NULL instead of -ENOENT.

Fixes: 8004c91e ("media: i2c: ov5670: Use common clock framework")
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: default avatarJacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 20af6be6
...@@ -2691,7 +2691,7 @@ static int ov5670_probe(struct i2c_client *client) ...@@ -2691,7 +2691,7 @@ static int ov5670_probe(struct i2c_client *client)
if (!ov5670) if (!ov5670)
return -ENOMEM; return -ENOMEM;
ov5670->xvclk = devm_clk_get(&client->dev, NULL); ov5670->xvclk = devm_clk_get_optional(&client->dev, NULL);
if (!IS_ERR_OR_NULL(ov5670->xvclk)) if (!IS_ERR_OR_NULL(ov5670->xvclk))
input_clk = clk_get_rate(ov5670->xvclk); input_clk = clk_get_rate(ov5670->xvclk);
else if (!ov5670->xvclk || PTR_ERR(ov5670->xvclk) == -ENOENT) else if (!ov5670->xvclk || PTR_ERR(ov5670->xvclk) == -ENOENT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment