aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/ov2640.c
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2017-08-27 13:30:37 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2017-10-04 17:07:42 -0300
commit877f1af154ec427d9c3c936a39a10afda95dcb97 (patch)
tree62669e6acf4075cd3d09026c59ea154194afd504 /drivers/media/i2c/ov2640.c
parent[media] mt9m111: Propagate the real error on v4l2_clk_get() failure (diff)
downloadlinux-dev-877f1af154ec427d9c3c936a39a10afda95dcb97.tar.xz
linux-dev-877f1af154ec427d9c3c936a39a10afda95dcb97.zip
[media] ov2640: Propagate the real error on devm_clk_get() failure
devm_clk_get() may return different error codes other than -EPROBE_DEFER, so it is better to return the real error code instead. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/ov2640.c')
-rw-r--r--drivers/media/i2c/ov2640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index e6d0c1f64f0b..e6cbe01bc4cf 100644
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -1107,7 +1107,7 @@ static int ov2640_probe(struct i2c_client *client,
if (client->dev.of_node) {
priv->clk = devm_clk_get(&client->dev, "xvclk");
if (IS_ERR(priv->clk))
- return -EPROBE_DEFER;
+ return PTR_ERR(priv->clk);
clk_prepare_enable(priv->clk);
}