aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranklin Meng <fmeng2002@yahoo.com>2009-09-12 10:31:05 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-24 08:27:27 -0700
commit330c9c3402b93246476e685c41da974663c152cc (patch)
tree4798aeea5eca12ff72d07b4b7309fe858227af2c
parenta3aa9dfe9a7ae1f4e7b6be739669a6d764f04481 (diff)
downloadlinux-linaro-stable-330c9c3402b93246476e685c41da974663c152cc.tar.gz
V4L: em28xx: set up tda9887_conf in em28xx_card_setup()
V4L: em28xx: set up tda9887_conf in em28xx_card_setup() (cherry picked from commit ae3340cbf59ea362c2016eea762456cc0969fd9e) Added tda9887_conf set up into em28xx_card_setup() Signed-off-by: Franklin Meng <fmeng2002@yahoo.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 7c70738479dd..168e89243f43 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -1886,6 +1886,9 @@ void em28xx_card_setup(struct em28xx *dev)
if (em28xx_boards[dev->model].tuner_addr)
dev->tuner_addr = em28xx_boards[dev->model].tuner_addr;
+ if (em28xx_boards[dev->model].tda9887_conf)
+ dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf;
+
/* request some modules */
switch (dev->model) {
case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: