summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-11-20 12:52:02 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-11-20 12:52:02 -0200
commitb3614e8b9c9b698b7be24a8f6436208ed6fa8184 (patch)
treebc4a0b37bbf9cfe215817c47d7e55b379d2ab31e /linux/drivers
parent1eab1d48fccb589c82e5f4ed660a2002fff802d2 (diff)
parentd5b1dfdd38731fd13595ee828949098c7f9b62f7 (diff)
downloadmediapointer-dvb-s2-b3614e8b9c9b698b7be24a8f6436208ed6fa8184.tar.gz
mediapointer-dvb-s2-b3614e8b9c9b698b7be24a8f6436208ed6fa8184.tar.bz2
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-av.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/ttpci/budget-av.c b/linux/drivers/media/dvb/ttpci/budget-av.c
index c7312420c..461e8d75b 100644
--- a/linux/drivers/media/dvb/ttpci/budget-av.c
+++ b/linux/drivers/media/dvb/ttpci/budget-av.c
@@ -655,6 +655,10 @@ static struct tda10021_config philips_cu1216_config = {
.demod_address = 0x0c,
};
+static struct tda10021_config philips_cu1216_config_altaddress = {
+ .demod_address = 0x0d,
+};
+
@@ -1013,6 +1017,10 @@ static void frontend_init(struct budget_av *budget_av)
fe = dvb_attach(tda10021_attach, &philips_cu1216_config,
&budget_av->budget.i2c_adap,
read_pwm(budget_av));
+ if (fe == NULL)
+ fe = dvb_attach(tda10021_attach, &philips_cu1216_config_altaddress,
+ &budget_av->budget.i2c_adap,
+ read_pwm(budget_av));
if (fe) {
budget_av->tda10021_poclkp = 1;
budget_av->tda10021_set_frontend = fe->ops.set_frontend;