]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
media: ov7670: Return the real error code
authorFabio Estevam <fabio.estevam@nxp.com>
Wed, 19 Jul 2017 03:34:18 +0000 (23:34 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 8 Aug 2017 10:24:33 +0000 (06:24 -0400)
When devm_clk_get() fails the real error code should be propagated,
instead of always returning -EPROBE_DEFER.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/i2c/ov7670.c

index 7270c68ed18a5319992f6fa8aee793f04a3ec056..552a881e24da246b6f0842f19292e53404e16157 100644 (file)
@@ -1614,7 +1614,7 @@ static int ov7670_probe(struct i2c_client *client,
 
        info->clk = devm_clk_get(&client->dev, "xclk");
        if (IS_ERR(info->clk))
-               return -EPROBE_DEFER;
+               return PTR_ERR(info->clk);
        clk_prepare_enable(info->clk);
 
        ret = ov7670_init_gpio(client, info);