]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
media: em28xx: fix input name for Terratec AV 350
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 14 Sep 2018 04:20:21 +0000 (00:20 -0400)
committerJuerg Haefliger <juergh@canonical.com>
Wed, 24 Jul 2019 01:57:40 +0000 (19:57 -0600)
BugLink: https://bugs.launchpad.net/bugs/1836802
commit 15644bfa195bd166d0a5ed76ae2d587f719c3dac upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/media/usb/em28xx/em28xx-cards.c

index 11a59854a0a62642c08c8cb95fe8cc1f7cb74f04..9747e23aad271d888d4cbf049ee5480fa3d9a1b6 100644 (file)
@@ -2112,13 +2112,13 @@ 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,
                } },
        },