]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: em28xx: remove tuner type from Hauppauge DVB DualHD
authorBradford Love <brad@nextdimension.cc>
Thu, 12 Mar 2026 21:35:32 +0000 (16:35 -0500)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Tue, 17 Mar 2026 09:50:19 +0000 (10:50 +0100)
This reverts a patch which was perhaps inadvertently added.

This was changed during the 5.15-rc4 merge. The faulty commit appears
lost in the pull request somehow, I cannot find it to check the
explanation.

commit c52e7b855b33 ("Merge tag 'v5.15-rc4' into media_tree")

There was nothing wrong with this device and no reason to moodify the
board profile. The DVB capabilities are added via dvb_module_probe.
Additionally, the device contains *zero* analog inputs, so I'm not
sure why one was added.

Signed-off-by: Bradford Love <brad@nextdimension.cc>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
drivers/media/usb/em28xx/em28xx-cards.c

index 2d19f8ecd6857a3285ccb2be2c4a2270af7018da..d7075ebabceb85e789bc0ce7031b5e42532775b6 100644 (file)
@@ -2522,17 +2522,12 @@ const struct em28xx_board em28xx_boards[] = {
                .def_i2c_bus   = 1,
                .i2c_speed     = EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_400_KHZ,
-               .tuner_type    = TUNER_SI2157,
+               .tuner_type    = TUNER_ABSENT,
                .tuner_gpio    = hauppauge_dualhd_dvb,
                .has_dvb       = 1,
                .has_dual_ts   = 1,
                .ir_codes      = RC_MAP_HAUPPAUGE,
                .leds          = hauppauge_dualhd_leds,
-               .input         = { {
-                       .type     = EM28XX_VMUX_COMPOSITE,
-                       .vmux     = TVP5150_COMPOSITE1,
-                       .amux     = EM28XX_AMUX_LINE_IN,
-               } },
        },
        /*
         * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Isoc.