[PATCH 3.16 053/370] [media] DaVinci-VPFE-Capture: fix error handling

From: Ben Hutchings
Date: Fri Mar 10 2017 - 09:29:16 EST

3.16.42-rc1 review patch. If anyone has any objections, please let me know.


From: Arnd Bergmann <arnd@xxxxxxxx>

commit d3d83ee20afda16ad0133ba00f63c11a8d842a35 upstream.

A recent cleanup had the right idea to remove the initialization
of the error variable, but missed the actual benefit of that,
which is that we get warnings if there is a bug in it. Now
we get a warning about a bug that was introduced by this cleanup:

drivers/media/platform/davinci/vpfe_capture.c: In function 'vpfe_probe':
drivers/media/platform/davinci/vpfe_capture.c:1992:9: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This adds the missing initialization that the warning is about,
and another one that was preexisting and that we did not get
a warning for. That second bug has existed since the driver
was first added.

Fixes: efb74461f5a6 ("[media] DaVinci-VPFE-Capture: Delete an unnecessary variable initialisation in vpfe_probe()")
Fixes: 7da8a6cb3e5b ("V4L/DVB (12248): v4l: vpfe capture bridge driver for DM355 and DM6446")

[mchehab@xxxxxxxxxxxxxxxx: fix a merge conflict]
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>

Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
drivers/media/platform/davinci/vpfe_capture.c | 1 +
1 file changed, 1 insertion(+)

--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -1967,6 +1967,7 @@ static int vpfe_probe(struct platform_de
"v4l2 sub device %s register fails\n",
+ ret = -ENXIO;
goto probe_sd_out;