From 9afa7820cb548107fb32bc7392f79113c88873cb Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 1 Nov 2007 16:56:26 -0300 Subject: [PATCH] --- yaml --- r: 76364 b: refs/heads/master c: 352fae1dffe2d0d04949e579d03667377a176cff h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-cards.c | 3 ++- trunk/drivers/media/video/tuner-xc2028.c | 3 +++ trunk/drivers/media/video/tuner-xc2028.h | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9deb12ea9951..0af06d95f098 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ae1fe2a0935afa878b8a506633fea45a8b00293 +refs/heads/master: 352fae1dffe2d0d04949e579d03667377a176cff diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c index 61b0c5a55df6..b56e0a70d8f8 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-cards.c +++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c @@ -371,7 +371,8 @@ static void em28xx_config_tuner (struct em28xx *dev) memset (&ctl,0,sizeof(ctl)); - ctl.fname = XC2028_DEFAULT_FIRMWARE; + ctl.fname = XC2028_DEFAULT_FIRMWARE; + ctl.max_len = 64; xc2028_cfg.tuner = TUNER_XC2028; xc2028_cfg.priv = &ctl; diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c index 813b54971e1a..b9135b7c4337 100644 --- a/trunk/drivers/media/video/tuner-xc2028.c +++ b/trunk/drivers/media/video/tuner-xc2028.c @@ -685,6 +685,9 @@ static int xc2028_set_config (struct dvb_frontend *fe, void *priv_cfg) strcpy(priv->ctrl.fname, p->fname); } + if (p->max_len>0) + priv->max_len = p->max_len; + tuner_info("%s OK\n", __FUNCTION__); return 0; diff --git a/trunk/drivers/media/video/tuner-xc2028.h b/trunk/drivers/media/video/tuner-xc2028.h index f4856f07bd08..4e5e4d5d1b5f 100644 --- a/trunk/drivers/media/video/tuner-xc2028.h +++ b/trunk/drivers/media/video/tuner-xc2028.h @@ -19,6 +19,7 @@ enum xc2028_firm_type { struct xc2028_ctrl { enum xc2028_firm_type type; char *fname; + int max_len; }; /* xc2028 commands for callback */