From a0da38eb88b1dd4e9a555f0b5c0c2c290e870858 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Thu, 22 Nov 2007 12:19:37 -0300
Subject: [PATCH] --- yaml --- r: 76469 b: refs/heads/master c:
 71a2ee37e8851f430d72daea0722908512d57f79 h: refs/heads/master i:   76467:
 51241645e7078514e152e299026c579c32a4e30d v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/tuner-xc2028.c | 5 ++++-
 trunk/drivers/media/video/tuner-xc2028.h | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 28e4e8f48902..c75ca248fafa 100644
--- 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
index 6a6642ea48ce..c231e7a74ffb 100644
--- 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
index f24fb2a00f6f..a59d00fb2a36 100644
--- 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);
 };