---

yaml --- r: 76469 b: refs/heads/master c: 71a2ee3 h: refs/heads/master i: 76467: 5124164 v: v3
git-mirror · Jan 25, 2008 · a0da38e · a0da38e
1 parent 505880a
commit a0da38e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5add9a6f3c90680f89b4694e81025d2aed9559af
+refs/heads/master: 71a2ee37e8851f430d72daea0722908512d57f79
diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c
@@ -1061,7 +1061,7 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
 	if (debug)
 		printk(KERN_DEBUG PREFIX ": Xcv2028/3028 init called!\n");
 
-	if (NULL == cfg->video_dev)
+	if (NULL == cfg || NULL == cfg->video_dev)
 		return NULL;
 
 	if (!fe) {
@@ -1106,6 +1106,9 @@ void *xc2028_attach(struct dvb_frontend *fe, struct xc2028_config *cfg)
 
 	tuner_info("type set to %s\n", "XCeive xc2028/xc3028 tuner");
 
+	if (cfg->ctrl)
+		xc2028_set_config(fe, cfg->ctrl);
+
 	mutex_unlock(&xc2028_list_mutex);
 
 	return fe;

diff --git a/trunk/drivers/media/video/tuner-xc2028.h b/trunk/drivers/media/video/tuner-xc2028.h
@@ -23,6 +23,7 @@ struct xc2028_config {
 	struct i2c_adapter *i2c_adap;
 	u8 		   i2c_addr;
 	void               *video_dev;
+	struct xc2028_ctrl *ctrl;
 	int                (*callback) (void *dev, int command, int arg);
 };