Commit ce89cfb4 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7648): cx23885: Load any module dependencies accordingly 



For boards that require the avcore (cx25840) to be active, ensure
it gets loaded.

Signed-off-by: default avatarSteven Toth <stoth@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a780a31c

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

+10 −0
Original line number Diff line number Diff line
@@ -431,6 +431,16 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
		ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;

	}



	/* Certain boards support analog, or require the avcore to be

	 * loaded, ensure this happens.

	 */

	switch (dev->board) {

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

	case CX23885_BOARD_HAUPPAUGE_HVR1700:

		request_module("cx25840");

		break;

	}

}



/* ------------------------------------------------------------------ */

drivers/media/video/cx23885/cx23885-core.c

+1 −1
Original line number Diff line number Diff line
@@ -744,8 +744,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) 
	cx23885_i2c_register(&dev->i2c_bus[0]);

	cx23885_i2c_register(&dev->i2c_bus[1]);

	cx23885_i2c_register(&dev->i2c_bus[2]);

	cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);

	cx23885_card_setup(dev);

	cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);

	cx23885_ir_init(dev);



	if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {