lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (6560): Fix a bug when setting tuner type

Browse Source 
Tuner-type were correctly filled only by the hint function.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab
2007-11-05 08:42:55 -03:00
parent b873e1a3cc
commit f8b6030ccc
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/video/em28xx/em28xx-cards.c
View File

@@ -564,8 +564,26 @@ static int em28xx_hint_board(struct em28xx *dev)
return -1; return -1;
} }
static void em28xx_set_model(struct em28xx *dev)
{
dev->is_em2800 = em28xx_boards[dev->model].is_em2800;
dev->has_tuner = em28xx_boards[dev->model].has_tuner;
dev->has_msp34xx = em28xx_boards[dev->model].has_msp34xx;
dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf;
dev->decoder = em28xx_boards[dev->model].decoder;
dev->video_inputs = em28xx_boards[dev->model].vchannels;
if (!em28xx_boards[dev->model].has_tuner)
dev->tuner_type = UNSET;
}
void em28xx_card_setup(struct em28xx *dev) void em28xx_card_setup(struct em28xx *dev)
{ {
em28xx_set_model(dev);
dev->tuner_type = em28xx_boards[dev->model].tuner_type;
/* request some modules */ /* request some modules */
switch (dev->model) { switch (dev->model) {
case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
@@ -593,16 +611,11 @@ void em28xx_card_setup(struct em28xx *dev)
break; break;
case EM2820_BOARD_UNKNOWN: case EM2820_BOARD_UNKNOWN:
case EM2800_BOARD_UNKNOWN: case EM2800_BOARD_UNKNOWN:
em28xx_hint_board(dev); if (!em28xx_hint_board(dev))
em28xx_set_model(dev);
} }
dev->is_em2800 = em28xx_boards[dev->model].is_em2800; /* Allow override tuner type by a module parameter */
dev->has_tuner = em28xx_boards[dev->model].has_tuner;
dev->has_msp34xx = em28xx_boards[dev->model].has_msp34xx;
dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf;
dev->decoder = em28xx_boards[dev->model].decoder;
dev->video_inputs = em28xx_boards[dev->model].vchannels;
if (tuner >= 0) if (tuner >= 0)
dev->tuner_type = tuner; dev->tuner_type = tuner;