summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-02-14 21:45:50 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-02-24 12:57:19 -0300
commit7c486c0fe6c57e06fea5ecb1214b3bc28bafe0e2 (patch)
treef145048c9245944e49a3dac513fac144c514a177 /drivers/media/platform
parent4b2f1ed15e01984b5225df715df949084796dfb9 (diff)
downloadlinux-7c486c0fe6c57e06fea5ecb1214b3bc28bafe0e2.tar.bz2
[media] omap3isp: Don't ignore failure to locate external subdev
A failure to locate the external subdev for a non memory-to-memory pipeline is a fatal error, don't ignore it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Tested-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/omap3isp/ispvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 313fd13994a1..a62cf0b84510 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -886,7 +886,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
struct v4l2_ext_controls ctrls;
struct v4l2_ext_control ctrl;
unsigned int i;
- int ret = 0;
+ int ret;
/* Memory-to-memory pipelines have no external subdev. */
if (pipe->input != NULL)
@@ -909,7 +909,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
if (!source) {
dev_warn(isp->dev, "can't find source, failing now\n");
- return ret;
+ return -EINVAL;
}
if (media_entity_type(source) != MEDIA_ENT_T_V4L2_SUBDEV)