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

Commit ac07bb73 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed 



Currently, the logic to load ir i2c ancillary module is broken. It is
associated to Hauppauge devices with IR flag on their eeprom, no matter
if the device uses i2c or em28xx direct IR support. That's wrong.

Instead, add a flag to the boards that use i2c IR chips and load the
module only for those devices and if ir is not disabled.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7aedd5ec

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

+9 −5
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ struct em28xx_board em28xx_boards[] = { 
	[EM2820_BOARD_TERRATEC_CINERGY_250] = {

		.name         = "Terratec Cinergy 250 USB",

		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,

		.has_ir_i2c   = 1,

		.tda9887_conf = TDA9887_PRESENT,

		.decoder      = EM28XX_SAA711X,

		.input        = { {
@@ -318,6 +319,7 @@ struct em28xx_board em28xx_boards[] = { 
	[EM2820_BOARD_PINNACLE_USB_2] = {

		.name         = "Pinnacle PCTV USB 2",

		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,

		.has_ir_i2c   = 1,

		.tda9887_conf = TDA9887_PRESENT,

		.decoder      = EM28XX_SAA711X,

		.input        = { {
@@ -342,6 +344,7 @@ struct em28xx_board em28xx_boards[] = { 
				TDA9887_PORT2_ACTIVE,

		.decoder      = EM28XX_TVP5150,

		.has_msp34xx  = 1,

		.has_ir_i2c   = 1,

		.input        = { {

			.type     = EM28XX_VMUX_TELEVISION,

			.vmux     = TVP5150_COMPOSITE0,
@@ -960,6 +963,7 @@ struct em28xx_board em28xx_boards[] = { 
	[EM2800_BOARD_TERRATEC_CINERGY_200] = {

		.name         = "Terratec Cinergy 200 USB",

		.is_em2800    = 1,

		.has_ir_i2c   = 1,

		.tuner_type   = TUNER_LG_PAL_NEW_TAPC,

		.tda9887_conf = TDA9887_PRESENT,

		.decoder      = EM28XX_SAA711X,
@@ -2277,7 +2281,7 @@ void em28xx_card_setup(struct em28xx *dev) 
	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:

	{

		struct tveeprom tv;

#ifdef CONFIG_MODULES

#if defined(CONFIG_MODULES) && defined(MODULE)

		request_module("tveeprom");

#endif

		/* Call first TVeeprom */
@@ -2291,10 +2295,6 @@ void em28xx_card_setup(struct em28xx *dev) 
			dev->i2s_speed = 2048000;

			dev->board.has_msp34xx = 1;

		}

#ifdef CONFIG_MODULES

		if (tv.has_ir)

			request_module("ir-kbd-i2c");

#endif

		break;

	}

	case EM2882_BOARD_KWORLD_ATSC_315U:
@@ -2335,6 +2335,10 @@ void em28xx_card_setup(struct em28xx *dev) 
		break;

	}



#if defined(CONFIG_MODULES) && defined(MODULE)

	if (dev->board.has_ir_i2c && !disable_ir)

		request_module("ir-kbd-i2c");

#endif

	if (dev->board.has_snapshot_button)

		em28xx_register_snapshot_button(dev);

drivers/media/video/em28xx/em28xx.h

+1 −0
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ struct em28xx_board { 
	unsigned int has_snapshot_button:1;

	unsigned int is_webcam:1;

	unsigned int valid:1;

	unsigned int has_ir_i2c:1;



	unsigned char xclk, i2c_speed;

	unsigned char radio_addr;