diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-08-22 22:00:01 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-26 06:54:47 -0400 |
| commit | 43054ecced8ae77c805470447d72da4fdc276e02 (patch) | |
| tree | 31055a61b40808db8d544b96ed3d30126f416d8f /drivers/media | |
| parent | 9d3e976bb1ea736b6154fafac4957b85360dad93 (diff) | |
[media] davinci: vpif_capture: 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.
Introduced by commit 873229e4fdf34196aa5d707957c59ba54c25eaba
([media] media: davinci: vpif: capture: 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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/davinci/vpif_capture.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index b79280f8200d..1089834a4efe 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c | |||
| @@ -2154,6 +2154,7 @@ static __init int vpif_probe(struct platform_device *pdev) | |||
| 2154 | 2154 | ||
| 2155 | if (!vpif_obj.sd[i]) { | 2155 | if (!vpif_obj.sd[i]) { |
| 2156 | vpif_err("Error registering v4l2 subdevice\n"); | 2156 | vpif_err("Error registering v4l2 subdevice\n"); |
| 2157 | err = -ENOMEM; | ||
| 2157 | goto probe_subdev_out; | 2158 | goto probe_subdev_out; |
| 2158 | } | 2159 | } |
| 2159 | v4l2_info(&vpif_obj.v4l2_dev, | 2160 | v4l2_info(&vpif_obj.v4l2_dev, |