lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[110/129] [media] cx88: fix: dont duplicate xc4000 entry for radio
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    Content-Length: 2911
    Lines: 89

    From: Miroslav Slugen <thunder.mmm@gmail.com>

    commit b6854e3f31402476bcc9d2f41570389fa491de17 upstream.

    All radio tuners in cx88 driver using same address for radio and tuner,
    so there is no need to probe it twice for same tuner and we can use
    radio_type UNSET, this also fix broken radio since kernel 2.6.39-rc1
    for those tuners.

    Signed-off-by: Miroslav Slugen <thunder.mmm@gmail.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/media/video/cx88/cx88-cards.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    --- a/drivers/media/video/cx88/cx88-cards.c
    +++ b/drivers/media/video/cx88/cx88-cards.c
    @@ -1573,8 +1573,8 @@ static const struct cx88_board cx88_boar
    .name = "Pinnacle Hybrid PCTV",
    .tuner_type = TUNER_XC2028,
    .tuner_addr = 0x61,
    - .radio_type = TUNER_XC2028,
    - .radio_addr = 0x61,
    + .radio_type = UNSET,
    + .radio_addr = ADDR_UNSET,
    .input = { {
    .type = CX88_VMUX_TELEVISION,
    .vmux = 0,
    @@ -1611,8 +1611,8 @@ static const struct cx88_board cx88_boar
    .name = "Leadtek TV2000 XP Global",
    .tuner_type = TUNER_XC2028,
    .tuner_addr = 0x61,
    - .radio_type = TUNER_XC2028,
    - .radio_addr = 0x61,
    + .radio_type = UNSET,
    + .radio_addr = ADDR_UNSET,
    .input = { {
    .type = CX88_VMUX_TELEVISION,
    .vmux = 0,
    @@ -2043,8 +2043,8 @@ static const struct cx88_board cx88_boar
    .name = "Terratec Cinergy HT PCI MKII",
    .tuner_type = TUNER_XC2028,
    .tuner_addr = 0x61,
    - .radio_type = TUNER_XC2028,
    - .radio_addr = 0x61,
    + .radio_type = UNSET,
    + .radio_addr = ADDR_UNSET,
    .input = { {
    .type = CX88_VMUX_TELEVISION,
    .vmux = 0,
    @@ -2082,9 +2082,9 @@ static const struct cx88_board cx88_boar
    [CX88_BOARD_WINFAST_DTV1800H] = {
    .name = "Leadtek WinFast DTV1800 Hybrid",
    .tuner_type = TUNER_XC2028,
    - .radio_type = TUNER_XC2028,
    + .radio_type = UNSET,
    .tuner_addr = 0x61,
    - .radio_addr = 0x61,
    + .radio_addr = ADDR_UNSET,
    /*
    * GPIO setting
    *
    @@ -2123,9 +2123,9 @@ static const struct cx88_board cx88_boar
    [CX88_BOARD_WINFAST_DTV1800H_XC4000] = {
    .name = "Leadtek WinFast DTV1800 H (XC4000)",
    .tuner_type = TUNER_XC4000,
    - .radio_type = TUNER_XC4000,
    + .radio_type = UNSET,
    .tuner_addr = 0x61,
    - .radio_addr = 0x61,
    + .radio_addr = ADDR_UNSET,
    /*
    * GPIO setting
    *
    @@ -2164,9 +2164,9 @@ static const struct cx88_board cx88_boar
    [CX88_BOARD_WINFAST_DTV2000H_PLUS] = {
    .name = "Leadtek WinFast DTV2000 H PLUS",
    .tuner_type = TUNER_XC4000,
    - .radio_type = TUNER_XC4000,
    + .radio_type = UNSET,
    .tuner_addr = 0x61,
    - .radio_addr = 0x61,
    + .radio_addr = ADDR_UNSET,
    /*
    * GPIO
    * 2: 1: mute audio



    \
     
     \ /
      Last update: 2012-01-24 03:57    [W:4.099 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site