From 7fc20a2ddcd7f021c7db80842e39521322224cad Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 5 Nov 2007 09:30:39 -0300 Subject: [PATCH] --- yaml --- r: 76387 b: refs/heads/master c: 98ae127cae56b99f2282d73399e0e1ca7dc13bc9 h: refs/heads/master i: 76385: 3048b7447fc85b23498a19c966b40b52ee96d474 76383: 4e4d1d79994ff4facfce0326193511a6ddb3be71 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 8 +++++++- trunk/drivers/media/video/tveeprom.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 41853723f28e..30eb8d139c2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80b522085a2c870ba0c0bdf2415cc925d7c86ca5 +refs/heads/master: 98ae127cae56b99f2282d73399e0e1ca7dc13bc9 diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index b1afc6c2d372..a2c0794821ba 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -587,11 +587,11 @@ void em28xx_card_setup(struct em28xx *dev) /* request some modules */ switch (dev->model) { case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: + case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900: { struct tveeprom tv; #ifdef CONFIG_MODULES request_module("tveeprom"); - request_module("ir-kbd-i2c"); #endif /* Call first TVeeprom */ @@ -603,6 +603,12 @@ void em28xx_card_setup(struct em28xx *dev) dev->i2s_speed = 2048000; dev->has_msp34xx = 1; } +#ifdef CONFIG_MODULES + if (tv.has_ir) + request_module("ir-kbd-i2c"); +#endif + /* FIXME: Should also retrieve decoder processor type */ + break; } case EM2820_BOARD_KWORLD_PVRTV2800RF: diff --git a/trunk/drivers/media/video/tveeprom.c b/trunk/drivers/media/video/tveeprom.c index 0faa14992353..403fbd0afa3f 100644 --- a/trunk/drivers/media/video/tveeprom.c +++ b/trunk/drivers/media/video/tveeprom.c @@ -226,7 +226,7 @@ hauppauge_tuner[] = { TUNER_ABSENT, "TCL M2523_3DI_E"}, { TUNER_ABSENT, "Samsung THPD5222FG30A"}, /* 120-129 */ - { TUNER_ABSENT, "Xceive XC3028"}, + { TUNER_XC2028, "Xceive XC3028"}, { TUNER_ABSENT, "Philips FQ1216LME MK5"}, { TUNER_ABSENT, "Philips FQD1216LME"}, { TUNER_ABSENT, "Conexant CX24118A"},