diff options
| author |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-05 08:42:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:02:01 -0200 |
| commit | f8b6030ccca06bf0d45d9b0908caac9b624a9beb (patch) | |
| tree | 7aac9d39f1370d3bfed22993696bedad3841ccae | |
| parent | V4L/DVB (6559): Fix a buffer overflow at xc2028_get_reg (diff) | |
| download | linux-dev-f8b6030ccca06bf0d45d9b0908caac9b624a9beb.tar.xz linux-dev-f8b6030ccca06bf0d45d9b0908caac9b624a9beb.zip | |
V4L/DVB (6560): Fix a bug when setting tuner type
Tuner-type were correctly filled only by the hint function.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index e88bf6700e63..b1afc6c2d372 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -564,8 +564,26 @@ static int em28xx_hint_board(struct em28xx *dev) 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) { + em28xx_set_model(dev); + + dev->tuner_type = em28xx_boards[dev->model].tuner_type; + /* request some modules */ switch (dev->model) { case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: @@ -593,16 +611,11 @@ void em28xx_card_setup(struct em28xx *dev) break; case EM2820_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; - 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; - + /* Allow override tuner type by a module parameter */ if (tuner >= 0) dev->tuner_type = tuner; |