lkml.org 
[lkml]   [2019]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 033/305] media: em28xx: fix input name for Terratec AV 350
    3.16.63-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

    commit 15644bfa195bd166d0a5ed76ae2d587f719c3dac upstream.

    Instead of using a register value, use an AMUX name, as otherwise
    VIDIOC_G_AUDIO would fail.

    Fixes: 766ed64de554 ("V4L/DVB (11827): Add support for Terratec Grabster AV350")
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/usb/em28xx/em28xx-cards.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/media/usb/em28xx/em28xx-cards.c
    +++ b/drivers/media/usb/em28xx/em28xx-cards.c
    @@ -2001,13 +2001,13 @@ struct em28xx_board em28xx_boards[] = {
    .input = { {
    .type = EM28XX_VMUX_COMPOSITE1,
    .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,
    } },
    },
    \
     
     \ /
      Last update: 2019-02-03 15:04    [W:4.095 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site