summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/cx24116.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-09 15:34:06 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-09 15:34:06 -0200
commit5799331703b7837fcfbef38d643300b2b8da0ba6 (patch)
treeaf842050c6bbc27e74a055bb6899cc409cde63d7 /linux/drivers/media/dvb/frontends/cx24116.c
parentf9263f9b94e9a6f28065616efc07eb78d000a662 (diff)
parentfeaba1cfa7f4825040ea17cec9408f3a4bba6dbd (diff)
downloadmediapointer-dvb-s2-5799331703b7837fcfbef38d643300b2b8da0ba6.tar.gz
mediapointer-dvb-s2-5799331703b7837fcfbef38d643300b2b8da0ba6.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-sliced-vbi
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/cx24116.c')
-rw-r--r--linux/drivers/media/dvb/frontends/cx24116.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24116.c b/linux/drivers/media/dvb/frontends/cx24116.c
index db1e1e4ea..8301a9865 100644
--- a/linux/drivers/media/dvb/frontends/cx24116.c
+++ b/linux/drivers/media/dvb/frontends/cx24116.c
@@ -1184,7 +1184,12 @@ static int cx24116_initfe(struct dvb_frontend *fe)
if (ret != 0)
return ret;
- return cx24116_diseqc_init(fe);
+ ret = cx24116_diseqc_init(fe);
+ if (ret != 0)
+ return ret;
+
+ /* HVR-4000 needs this */
+ return cx24116_set_voltage(fe, SEC_VOLTAGE_13);
}
/*