OSDN Git Service

[media] DaVinci-VPFE-Capture: fix error handling
authorArnd Bergmann <arnd@arndb.de>
Tue, 22 Nov 2016 20:52:17 +0000 (18:52 -0200)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 25 Nov 2016 09:57:07 +0000 (07:57 -0200)
commitd3d83ee20afda16ad0133ba00f63c11a8d842a35
treee815ded9f05664f4c540965e0fafa6ecb8cf8bc3
parent399426cadf5b0539a5b2a4d805257ce8acc6aba2
[media] DaVinci-VPFE-Capture: fix error handling

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@s-opensource.com: fix a merge conflict]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/davinci/vpfe_capture.c