From ecef0f62217a4eab8fcab654d88c2ed0eedbd073 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Fri, 5 Feb 2010 14:33:38 -0200 Subject: [PATCH] --- yaml --- r: 181661 b: refs/heads/master c: 0a71102f105870a4a245edd1b291fa723a8f3a48 h: refs/heads/master i: 181659: 517b0fc0210028bc727b148a1f4f3a40cfe7faad v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 39e9face2bfb..19c1c5aadecc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87147ff03a8aa27b9cc94872b195e6f8bb922feb +refs/heads/master: 0a71102f105870a4a245edd1b291fa723a8f3a48 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index b1c5d9516e22..62ca31d44b56 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -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);