aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c3
-rw-r--r--drivers/media/video/tuner-xc2028.c3
-rw-r--r--drivers/media/video/tuner-xc2028.h1
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 61b0c5a55df6..b56e0a70d8f8 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -371,7 +371,8 @@ static void em28xx_config_tuner (struct em28xx *dev)
371 371
372 memset (&ctl,0,sizeof(ctl)); 372 memset (&ctl,0,sizeof(ctl));
373 373
374 ctl.fname = XC2028_DEFAULT_FIRMWARE; 374 ctl.fname = XC2028_DEFAULT_FIRMWARE;
375 ctl.max_len = 64;
375 376
376 xc2028_cfg.tuner = TUNER_XC2028; 377 xc2028_cfg.tuner = TUNER_XC2028;
377 xc2028_cfg.priv = &ctl; 378 xc2028_cfg.priv = &ctl;
diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 813b54971e1a..b9135b7c4337 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -685,6 +685,9 @@ static int xc2028_set_config (struct dvb_frontend *fe, void *priv_cfg)
685 strcpy(priv->ctrl.fname, p->fname); 685 strcpy(priv->ctrl.fname, p->fname);
686 } 686 }
687 687
688 if (p->max_len>0)
689 priv->max_len = p->max_len;
690
688 tuner_info("%s OK\n", __FUNCTION__); 691 tuner_info("%s OK\n", __FUNCTION__);
689 692
690 return 0; 693 return 0;
diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
index f4856f07bd08..4e5e4d5d1b5f 100644
--- a/drivers/media/video/tuner-xc2028.h
+++ b/drivers/media/video/tuner-xc2028.h
@@ -19,6 +19,7 @@ enum xc2028_firm_type {
19struct xc2028_ctrl { 19struct xc2028_ctrl {
20 enum xc2028_firm_type type; 20 enum xc2028_firm_type type;
21 char *fname; 21 char *fname;
22 int max_len;
22}; 23};
23 24
24/* xc2028 commands for callback */ 25/* xc2028 commands for callback */