V4L/DVB: Fix logic for Leadtek winfast tv usbii deluxe
authorDouglas Schilling Landgraf <dougsland@redhat.com>
Fri, 5 Feb 2010 16:33:38 +0000 (14:33 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:10:56 +0000 (15:10 -0300)
As pointed by Magnus Alm <magnus.alm@gmail.com>, commit 99dbd128bb applied
a hunk at the wrong place. This patch moves the code to the right place.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-cards.c

index b1c5d95..62ca31d 100644 (file)
@@ -2300,6 +2300,10 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                dev->init_data.ir_codes = &ir_codes_rc5_hauppauge_new_table;
                dev->init_data.get_key = em28xx_get_key_em_haup;
                dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
+       case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
+               dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
+               dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
+               dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
                break;
        }
 
@@ -2356,11 +2360,6 @@ void em28xx_card_setup(struct em28xx *dev)
                        dev->board.has_msp34xx = 1;
                }
                break;
-       case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
-               dev->init_data.ir_codes = &ir_codes_winfast_usbii_deluxe_table;;
-               dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
-               dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
-               break;
        }
        case EM2882_BOARD_KWORLD_ATSC_315U:
                em28xx_write_reg(dev, 0x0d, 0x42);