| Message ID | 1352157290-13201-1-git-send-email-agust@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 6 Nov 2012, Anatolij Gustschin wrote: > VIDIOC_S_GROP ioctl doesn't work, soc-camera driver reports: > > soc-camera-pdrv soc-camera-pdrv.0: S_CROP denied: getting current crop failed > > The issue is caused by checking for V4L2_BUF_TYPE_VIDEO_CAPTURE type > in driver's g_crop callback. This check should be in s_crop instead, > g_crop should just set the type field to V4L2_BUF_TYPE_VIDEO_CAPTURE > as other drivers do. Move the V4L2_BUF_TYPE_VIDEO_CAPTURE type check > to s_crop callback. I'm not sure this is correct: http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-g-crop.html Or is the .g_crop() subdev operation using a different semantics? Where is that documented? Thanks Guennadi > > Signed-off-by: Anatolij Gustschin <agust@denx.de> > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > drivers/media/i2c/soc_camera/ov5642.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c > index 8577e0c..19863e5 100644 > --- a/drivers/media/i2c/soc_camera/ov5642.c > +++ b/drivers/media/i2c/soc_camera/ov5642.c > @@ -872,6 +872,9 @@ static int ov5642_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) > struct v4l2_rect rect = a->c; > int ret; > > + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) > + return -EINVAL; > + > v4l_bound_align_image(&rect.width, 48, OV5642_MAX_WIDTH, 1, > &rect.height, 32, OV5642_MAX_HEIGHT, 1, 0); > > @@ -899,9 +902,7 @@ static int ov5642_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) > struct ov5642 *priv = to_ov5642(client); > struct v4l2_rect *rect = &a->c; > > - if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) > - return -EINVAL; > - > + a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; > *rect = priv->crop_rect; > > return 0; > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c index 8577e0c..19863e5 100644 --- a/drivers/media/i2c/soc_camera/ov5642.c +++ b/drivers/media/i2c/soc_camera/ov5642.c @@ -872,6 +872,9 @@ static int ov5642_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a) struct v4l2_rect rect = a->c; int ret; + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + v4l_bound_align_image(&rect.width, 48, OV5642_MAX_WIDTH, 1, &rect.height, 32, OV5642_MAX_HEIGHT, 1, 0); @@ -899,9 +902,7 @@ static int ov5642_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) struct ov5642 *priv = to_ov5642(client); struct v4l2_rect *rect = &a->c; - if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) - return -EINVAL; - + a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; *rect = priv->crop_rect; return 0;
VIDIOC_S_GROP ioctl doesn't work, soc-camera driver reports: soc-camera-pdrv soc-camera-pdrv.0: S_CROP denied: getting current crop failed The issue is caused by checking for V4L2_BUF_TYPE_VIDEO_CAPTURE type in driver's g_crop callback. This check should be in s_crop instead, g_crop should just set the type field to V4L2_BUF_TYPE_VIDEO_CAPTURE as other drivers do. Move the V4L2_BUF_TYPE_VIDEO_CAPTURE type check to s_crop callback. Signed-off-by: Anatolij Gustschin <agust@denx.de> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/i2c/soc_camera/ov5642.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)