The patch number 12384 was added via Jean-Francois Moine <moin...@free.fr>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
merge: v4l-dvb
---
linux/drivers/media/video/em28xx/em28xx-cards.c | 3 +++
linux/drivers/media/video/em28xx/em28xx-core.c | 2 +-
linux/drivers/media/video/em28xx/em28xx-video.c | 10 +++++++++-
linux/drivers/media/video/em28xx/em28xx.h | 1 +
4 files changed, 14 insertions(+), 2 deletions(-)
diff -r 835a204432f0 -r b5e00197396c
linux/drivers/media/video/em28xx/em28xx-cards.c
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c Sun Aug 02 11:56:47
2009 +0200
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c Wed Aug 05 11:58:27
2009 +0200
@@ -234,6 +234,7 @@
.xclk = EM28XX_XCLK_FREQUENCY_48MHZ,
.tuner_type = TUNER_ABSENT,
.is_webcam = 1,
+ .no_audio = 1,
.input = { {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0,
@@ -261,6 +262,7 @@
.name = "Unknown EM2750/28xx video grabber",
.tuner_type = TUNER_ABSENT,
.is_webcam = 1, /* To enable sensor probe */
+ .no_audio = 1,
},
[EM2750_BOARD_DLCW_130] = {
/* Beijing Huaqi Information Digital Technology Co., Ltd */
@@ -481,6 +483,7 @@
.name = "Silvercrest Webcam 1.3mpix",
.tuner_type = TUNER_ABSENT,
.is_webcam = 1,
+ .no_audio = 1,
.input = { {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = 0,
diff -r 835a204432f0 -r b5e00197396c
linux/drivers/media/video/em28xx/em28xx-core.c
--- a/linux/drivers/media/video/em28xx/em28xx-core.c Sun Aug 02 11:56:47
2009 +0200
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c Wed Aug 05 11:58:27
2009 +0200
@@ -494,7 +494,7 @@
/* If device doesn't support Usb Audio Class, use vendor class */
if (!dev->has_audio_class)
- dev->has_alsa_audio = 1;
+ dev->has_alsa_audio = ~dev->board.no_audio;
dev->audio_mode.has_audio = 1;
diff -r 835a204432f0 -r b5e00197396c
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Sun Aug 02 11:56:47
2009 +0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Wed Aug 05 11:58:27
2009 +0200
@@ -976,6 +976,9 @@
struct em28xx_fh *fh = priv;
struct em28xx *dev = fh->dev;
+ if (!dev->audio_mode.has_audio)
+ return -EINVAL;
+
switch (a->index) {
case EM28XX_AMUX_VIDEO:
strcpy(a->name, "Television");
@@ -1022,6 +1025,9 @@
return -EINVAL;
#else
+ if (!dev->audio_mode.has_audio)
+ return -EINVAL;
+
if (a->index >= MAX_EM28XX_INPUT)
return -EINVAL;
if (0 == INPUT(a->index)->type)
@@ -1444,9 +1450,11 @@
#endif
V4L2_CAP_SLICED_VBI_CAPTURE |
V4L2_CAP_VIDEO_CAPTURE |
- V4L2_CAP_AUDIO |
V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+ if (dev->audio_mode.has_audio)
+ cap->capabilities |= V4L2_CAP_AUDIO;
+
if (dev->tuner_type != TUNER_ABSENT)
cap->capabilities |= V4L2_CAP_TUNER;
diff -r 835a204432f0 -r b5e00197396c linux/drivers/media/video/em28xx/em28xx.h
--- a/linux/drivers/media/video/em28xx/em28xx.h Sun Aug 02 11:56:47 2009 +0200
+++ b/linux/drivers/media/video/em28xx/em28xx.h Wed Aug 05 11:58:27 2009 +0200
@@ -397,6 +397,7 @@
unsigned int has_dvb:1;
unsigned int has_snapshot_button:1;
unsigned int is_webcam:1;
+ unsigned int no_audio:1;
unsigned int valid:1;
unsigned char xclk, i2c_speed;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/b5e00197396ca7464d4cef99e3b8f39ca46f4101
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
