summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-08-23 03:59:44 +0200
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-08-26 12:54:33 +0200
commit9d3e976bb1ea736b6154fafac4957b85360dad93 (patch)
tree26e43babf69682d5790db97b5afb16ab10d03fe7
parent[media] MAINTAINERS: add entries for adv7511 and adv7842 (diff)
downloadlinux-9d3e976bb1ea736b6154fafac4957b85360dad93.tar.xz
linux-9d3e976bb1ea736b6154fafac4957b85360dad93.zip
[media] davinci: vpif_display: fix error return code in vpif_probe()
Fix to return -ENODEV in the subdevice register error handling case instead of 0, as done elsewhere in this function. Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2. ([media] media: davinci: vpif: display: add V4L2-async support) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/davinci/vpif_display.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index f2b4ae1a6a7b..c31bcf129a5d 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1818,6 +1818,7 @@ static __init int vpif_probe(struct platform_device *pdev)
NULL);
if (!vpif_obj.sd[i]) {
vpif_err("Error registering v4l2 subdevice\n");
+ err = -ENODEV;
goto probe_subdev_out;
}