From: Laurent Pinchart Date: Sat, 15 Feb 2014 00:45:50 +0000 (-0300) Subject: [media] omap3isp: Don't ignore failure to locate external subdev X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c486c0fe6c57e06fea5ecb1214b3bc28bafe0e2;p=linux-beck.git [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 Acked-by: Sakari Ailus Tested-by: Peter Meerwald Signed-off-by: Mauro Carvalho Chehab --- 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)