Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a71102f authored by Douglas Schilling Landgraf's avatar Douglas Schilling Landgraf Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: Fix logic for Leadtek winfast tv usbii deluxe 



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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 87147ff0

drivers/media/video/em28xx/em28xx-cards.c

+4 −5
Original line number Diff line number Diff line
@@ -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);