summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 10:30:28 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-01 10:30:28 -0200
commit9fdaf8936ef6a151aed8baf835bf98716e2b33bf (patch)
tree6b6b40173ab8b44cc819139b1cfb6287ef0c98f0
parentdc2ad40ab4bd4332ce049aa88f1f0041b1472994 (diff)
parentf1ee371d5b7780d8c85202d55a6602f61abb50b6 (diff)
downloadmediapointer-dvb-s2-9fdaf8936ef6a151aed8baf835bf98716e2b33bf.tar.gz
mediapointer-dvb-s2-9fdaf8936ef6a151aed8baf835bf98716e2b33bf.tar.bz2
merge: http://mercurial.intuxication.org/hg/v4l-dvb-commits/v4l-dvb-commits
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-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);
}
/*