summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/frontends/cx24116.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-02-13 20:13:17 -0200
commitadff0f37dc0f0ab48850eaad267223c634e975a2 (patch)
treec6aa3e259581abeb64eb7590b29a60354ec5a5ee /linux/drivers/media/dvb/frontends/cx24116.c
parente2b4212172d81f17f5e4741766f032d06e83ce4f (diff)
parentf25ebd42bbb82866dfbbba5b7bfc651315fa6416 (diff)
downloadmediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.gz
mediapointer-dvb-s2-adff0f37dc0f0ab48850eaad267223c634e975a2.tar.bz2
merge: http://linuxtv.org/hg/~tap/bttv
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);
}
/*