From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 27 Aug 2017 16:30:37 +0000 (-0300)
Subject: [media] ov2640: Propagate the real error on devm_clk_get() failure
X-Git-Tag: v4.15-rc1~91^2~232
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=877f1af154ec427d9c3c936a39a10afda95dcb97;p=thirdparty%2Fkernel%2Flinux.git

[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>
---

diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index e6d0c1f64f0b1..e6cbe01bc4cf9 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);
 	}