evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] omap3isp: Don't fail streamon when the sensor doesn't implement s_stream

Browse source 
The code handles subdevs with no s_stream operation correctly, but
returns -ENOIOCTLCMD by mistake if the first subdev in the chain has no
s_stream operation. Return 0 in that case.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Laurent Pinchart 2011-08-13 13:09:11 -03:00 • committed by Mauro Carvalho Chehab
parent 1e393e90ab
commit c62e2a19d2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/video/omap3isp/isp.c
View file

@ -732,7 +732,7 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe,
struct media_pad *pad; struct media_pad *pad;
struct v4l2_subdev *subdev; struct v4l2_subdev *subdev;
unsigned long flags; unsigned long flags;
int ret = 0; int ret;
spin_lock_irqsave(&pipe->lock, flags); spin_lock_irqsave(&pipe->lock, flags);
pipe->state &= ~(ISP_PIPELINE_IDLE_INPUT | ISP_PIPELINE_IDLE_OUTPUT); pipe->state &= ~(ISP_PIPELINE_IDLE_INPUT | ISP_PIPELINE_IDLE_OUTPUT);
@ -756,7 +756,7 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe,
ret = v4l2_subdev_call(subdev, video, s_stream, mode); ret = v4l2_subdev_call(subdev, video, s_stream, mode);
if (ret < 0 && ret != -ENOIOCTLCMD) if (ret < 0 && ret != -ENOIOCTLCMD)
break; return ret;
if (subdev == &isp->isp_ccdc.subdev) { if (subdev == &isp->isp_ccdc.subdev) {
v4l2_subdev_call(&isp->isp_aewb.subdev, video, v4l2_subdev_call(&isp->isp_aewb.subdev, video,
@ -777,7 +777,7 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe,
if (pipe->do_propagation && mode == ISP_PIPELINE_STREAM_SINGLESHOT) if (pipe->do_propagation && mode == ISP_PIPELINE_STREAM_SINGLESHOT)
atomic_inc(&pipe->frame_number); atomic_inc(&pipe->frame_number);
return ret; return 0;
} }
static int isp_pipeline_wait_resizer(struct isp_device *isp) static int isp_pipeline_wait_resizer(struct isp_device *isp)