Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-30 12:10:08 +0100
committerTakashi Iwai <tiwai@suse.de>2018-10-30 12:10:36 +0100
commit7cc732947eecd943e162bf24f688adf4b97bf10c (patch)
treeab07f6b3c0a9d11c51d1ca6609e1b6b5389cacf7
parent2f6526516bca4a274b8aa5bfc30c13ad6782843e (diff)
media: em28xx: fix input name for Terratec AV 350 (bsc#1051510).
-rw-r--r--patches.drivers/media-em28xx-fix-input-name-for-Terratec-AV-350.patch43
-rw-r--r--series.conf1
2 files changed, 44 insertions, 0 deletions
diff --git a/patches.drivers/media-em28xx-fix-input-name-for-Terratec-AV-350.patch b/patches.drivers/media-em28xx-fix-input-name-for-Terratec-AV-350.patch
new file mode 100644
index 0000000000..75788a0c34
--- /dev/null
+++ b/patches.drivers/media-em28xx-fix-input-name-for-Terratec-AV-350.patch
@@ -0,0 +1,43 @@
+From 15644bfa195bd166d0a5ed76ae2d587f719c3dac Mon Sep 17 00:00:00 2001
+From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Date: Fri, 14 Sep 2018 00:20:21 -0400
+Subject: [PATCH] media: em28xx: fix input name for Terratec AV 350
+Git-commit: 15644bfa195bd166d0a5ed76ae2d587f719c3dac
+Patch-mainline: v4.20-rc1
+References: bsc#1051510
+
+Instead of using a register value, use an AMUX name, as otherwise
+VIDIOC_G_AUDIO would fail.
+
+Cc: stable@vger.kernel.org
+Fixes: 766ed64de554 ("V4L/DVB (11827): Add support for Terratec Grabster AV350")
+Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/media/usb/em28xx/em28xx-cards.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
+index 06a7e09ded6e..87b887b7604e 100644
+--- a/drivers/media/usb/em28xx/em28xx-cards.c
++++ b/drivers/media/usb/em28xx/em28xx-cards.c
+@@ -2141,13 +2141,13 @@ const struct em28xx_board em28xx_boards[] = {
+ .input = { {
+ .type = EM28XX_VMUX_COMPOSITE,
+ .vmux = TVP5150_COMPOSITE1,
+- .amux = EM28XX_AUDIO_SRC_LINE,
++ .amux = EM28XX_AMUX_LINE_IN,
+ .gpio = terratec_av350_unmute_gpio,
+
+ }, {
+ .type = EM28XX_VMUX_SVIDEO,
+ .vmux = TVP5150_SVIDEO,
+- .amux = EM28XX_AUDIO_SRC_LINE,
++ .amux = EM28XX_AMUX_LINE_IN,
+ .gpio = terratec_av350_unmute_gpio,
+ } },
+ },
+--
+2.19.1
+
diff --git a/series.conf b/series.conf
index 3bafdf1b6e..155d1723fa 100644
--- a/series.conf
+++ b/series.conf
@@ -18297,6 +18297,7 @@
patches.drivers/media-dvb-fix-compat-ioctl-translation.patch
patches.drivers/media-tvp5150-avoid-going-past-array-on-v4l2_queryme.patch
patches.drivers/media-em28xx-use-a-default-format-if-TRY_FMT-fails.patch
+ patches.drivers/media-em28xx-fix-input-name-for-Terratec-AV-350.patch
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch