From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sun, 27 Aug 2017 16:30:36 +0000 (-0300)
Subject: [media] mt9m111: Propagate the real error on v4l2_clk_get() failure
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bddb4b53356d3c97ee387c9ae7f290e4c76e8bc6;p=linux.git

[media] mt9m111: Propagate the real error on v4l2_clk_get() failure

v4l2_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/mt9m111.c b/drivers/media/i2c/mt9m111.c
index 99b992e46702f..b1665d97e0fd9 100644
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -945,7 +945,7 @@ static int mt9m111_probe(struct i2c_client *client,
 
 	mt9m111->clk = v4l2_clk_get(&client->dev, "mclk");
 	if (IS_ERR(mt9m111->clk))
-		return -EPROBE_DEFER;
+		return PTR_ERR(mt9m111->clk);
 
 	/* Default HIGHPOWER context */
 	mt9m111->ctx = &context_b;