Patch "[media] saa7164: fix querycap warning" has been added to the 3.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
[media] saa7164: fix querycap warning
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
saa7164-fix-querycap-warning.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
534bc3e2ee93835badca753bedce8073c67caa92Mon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Fri, 27 Mar 2015 15:17:56 -0300
Subject: [media] saa7164: fix querycap warning
From: Hans Verkuil <[email protected]>
commit 534bc3e2ee93835badca753bedce8073c67caa92 upstream.
Fix the VIDIOC_QUERYCAP warning due to the missing device_caps. Don't fill in the version field, the V4L2 core will do that for you.
--- drivers/media/pci/saa7164/saa7164-encoder.c | 11 ++++++----- drivers/media/pci/saa7164/saa7164-vbi.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-)
drivers/media/pci/saa7164/saa7164-encoder.c +6 -5
@@ -711,13 +711,14 @@ static int vidioc_querycap(struct file * sizeof(cap->card));sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities = + cap->device_caps =V4L2_CAP_VIDEO_CAPTURE | -V4L2_CAP_READWRITE | -0 ; +V4L2_CAP_READWRITE | +V4L2_CAP_TUNER ; - cap->capabilities |=V4L2_CAP_TUNER ; - cap->version =0 ; + cap->capabilities = cap->device_caps | +V4L2_CAP_VBI_CAPTURE | +V4L2_CAP_DEVICE_CAPS ;return 0 ; }
drivers/media/pci/saa7164/saa7164-vbi.c +6 -5
@@ -650,13 +650,14 @@ static int vidioc_querycap(struct file * sizeof(cap->card));sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities = + cap->device_caps =V4L2_CAP_VBI_CAPTURE | -V4L2_CAP_READWRITE | -0 ; +V4L2_CAP_READWRITE | +V4L2_CAP_TUNER ; - cap->capabilities |=V4L2_CAP_TUNER ; - cap->version =0 ; + cap->capabilities = cap->device_caps | +V4L2_CAP_VIDEO_CAPTURE | +V4L2_CAP_DEVICE_CAPS ;return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/saa7164-fix-querycap-warning.patch
Quoted 8 lines · Greg Kroah-Hartman
This is a note to let you know that I've just added the patch titled
[media] saa7164: fix querycap warning
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
Quoted 7 lines
The filename of the patch is:
saa7164-fix-querycap-warning.patch
and it can be found in the queue-3.10 subdirectory.If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
This patch was tagged for stable v3.19 and up, so it probably isn't required for 3.10 or 3.14.
Cheers,
--
Lu�s
Quoted 75 lines
From
534bc3e2ee93835badca753bedce8073c67caa92Mon Sep 17 00:00:00 2001
From: Hans Verkuil <[email protected]>
Date: Fri, 27 Mar 2015 15:17:56 -0300
Subject: [media] saa7164: fix querycap warningFrom: Hans Verkuil <[email protected]>
commit
534bc3e2ee93835badca753bedce8073c67caa92upstream.Fix the
VIDIOC_QUERYCAPwarning due to the missingdevice_caps. Don't fill in the version field, the V4L2 core will do that for you.Signed-off-by Hans Verkuil <[email protected]>Signed-off-by Mauro Carvalho Chehab <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/media/pci/saa7164/saa7164-encoder.c | 11 ++++++----- drivers/media/pci/saa7164/saa7164-vbi.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-)drivers/media/pci/saa7164/saa7164-encoder.c +6
-5@@ -711,13 +711,14 @@ static int vidioc_querycap(struct file * sizeof(cap->card));sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities = + cap->device_caps =V4L2_CAP_VIDEO_CAPTURE | -V4L2_CAP_READWRITE | -0 ; +V4L2_CAP_READWRITE | +V4L2_CAP_TUNER ; - cap->capabilities |=V4L2_CAP_TUNER ; - cap->version =0 ; + cap->capabilities = cap->device_caps | +V4L2_CAP_VBI_CAPTURE | +V4L2_CAP_DEVICE_CAPS ;return 0 ; }drivers/media/pci/saa7164/saa7164-vbi.c +6
-5@@ -650,13 +650,14 @@ static int vidioc_querycap(struct file * sizeof(cap->card));sprintf (cap->bus_info,"PCI:%s" ,pci_name (dev->pci)); - cap->capabilities = + cap->device_caps =V4L2_CAP_VBI_CAPTURE | -V4L2_CAP_READWRITE | -0 ; +V4L2_CAP_READWRITE | +V4L2_CAP_TUNER ; - cap->capabilities |=V4L2_CAP_TUNER ; - cap->version =0 ; + cap->capabilities = cap->device_caps | +V4L2_CAP_VIDEO_CAPTURE | +V4L2_CAP_DEVICE_CAPS ;return 0 ; }Patches currently in stable-queue which might be from [email protected] are
queue-3.10/saa7164-fix-querycap-warning.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Greg KH
maintainerQuoted 13 lines · Luis Henriques
Quoted 12 lines · Greg Kroah-Hartman
This is a note to let you know that I've just added the patch titled
[media] saa7164: fix querycap warning
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summaryThe filename of the patch is:
saa7164-fix-querycap-warning.patch
and it can be found in the queue-3.10 subdirectory.
Quoted 6 lines
Quoted 3 lines
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
This patch was tagged for stable v3.19 and up, so it probably isn't required for 3.10 or 3.14.
Ah, good catch, now removed, thanks.
greg k-h