[REVIEW PATCH 1/1] omap3isp: Correctly set QUERYCAP capabilities

[REVIEW PATCH 1/1] omap3isp: Correctly set QUERYCAP capabilities

[Sakari Ailus]

device_caps in struct v4l2_capability were inadequately set in
VIDIOC_QUERYCAP. Fix this.

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
---
 drivers/media/platform/omap3isp/ispvideo.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index cdfec27..d644164 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -602,10 +602,13 @@ isp_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap)
 	strlcpy(cap->card, video->video.name, sizeof(cap->card));
 	strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));
 
+	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
+		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;
+
 	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-		cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+		cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
 	else
-		cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+		cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
 
 	return 0;
 }
-- 
1.7.10.4

Re: [REVIEW PATCH 1/1] omap3isp: Correctly set QUERYCAP capabilities

[Laurent Pinchart]

Hi Sakari,

Thank you for the patch.

On Thursday 01 January 2015 23:13:54 Sakari Ailus wrote:
> device_caps in struct v4l2_capability were inadequately set in
> VIDIOC_QUERYCAP. Fix this.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> ---
>  drivers/media/platform/omap3isp/ispvideo.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c
> b/drivers/media/platform/omap3isp/ispvideo.c index cdfec27..d644164 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -602,10 +602,13 @@ isp_video_querycap(struct file *file, void *fh, struct
> v4l2_capability *cap) strlcpy(cap->card, video->video.name,
> sizeof(cap->card));
>  	strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));
> 
> +	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
> +		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;

I would align the | under the =. Apart from that,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> +
>  	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
> -		cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
> +		cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
>  	else
> -		cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
> +		cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
> 
>  	return 0;
>  }

-- 
Regards,

Laurent Pinchart

Re: [REVIEW PATCH 1/1] omap3isp: Correctly set QUERYCAP capabilities

[Sakari Ailus]

On Fri, Jan 02, 2015 at 01:04:16AM +0200, Laurent Pinchart wrote:
> Hi Sakari,
> 
> Thank you for the patch.
> 
> On Thursday 01 January 2015 23:13:54 Sakari Ailus wrote:
> > device_caps in struct v4l2_capability were inadequately set in
> > VIDIOC_QUERYCAP. Fix this.
> > 
> > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> > ---
> >  drivers/media/platform/omap3isp/ispvideo.c |    7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/media/platform/omap3isp/ispvideo.c
> > b/drivers/media/platform/omap3isp/ispvideo.c index cdfec27..d644164 100644
> > --- a/drivers/media/platform/omap3isp/ispvideo.c
> > +++ b/drivers/media/platform/omap3isp/ispvideo.c
> > @@ -602,10 +602,13 @@ isp_video_querycap(struct file *file, void *fh, struct
> > v4l2_capability *cap) strlcpy(cap->card, video->video.name,
> > sizeof(cap->card));
> >  	strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));
> > 
> > +	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
> > +		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;
> 
> I would align the | under the =. Apart from that,
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

I assume you'd apply the patch to your tree eventually? Can you make the
change, or would you prefer me to resend?

-- 
Regards,

Sakari Ailus
e-mail: sakari.ailus@iki.fi	XMPP: sailus@retiisi.org.uk

Re: [REVIEW PATCH 1/1] omap3isp: Correctly set QUERYCAP capabilities

[Laurent Pinchart]

Hi Sakari,

On Friday 02 January 2015 10:54:41 Sakari Ailus wrote:
> On Fri, Jan 02, 2015 at 01:04:16AM +0200, Laurent Pinchart wrote:
> > On Thursday 01 January 2015 23:13:54 Sakari Ailus wrote:
> > > device_caps in struct v4l2_capability were inadequately set in
> > > VIDIOC_QUERYCAP. Fix this.
> > > 
> > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
> > > ---
> > > 
> > >  drivers/media/platform/omap3isp/ispvideo.c |    7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/media/platform/omap3isp/ispvideo.c
> > > b/drivers/media/platform/omap3isp/ispvideo.c index cdfec27..d644164
> > > 100644
> > > --- a/drivers/media/platform/omap3isp/ispvideo.c
> > > +++ b/drivers/media/platform/omap3isp/ispvideo.c
> > > @@ -602,10 +602,13 @@ isp_video_querycap(struct file *file, void *fh,
> > > struct v4l2_capability *cap) strlcpy(cap->card, video->video.name,
> > > sizeof(cap->card));
> > > 
> > >  	strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));
> > > 
> > > +	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT
> > > +		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;
> > 
> > I would align the | under the =. Apart from that,
> > 
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> 
> I assume you'd apply the patch to your tree eventually? Can you make the
> change, or would you prefer me to resend?

I can make the change when applying, no need to resend. I'll send a pull 
request for v3.20.

-- 
Regards,

Laurent Pinchart