summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2015-11-19 18:03:57 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-12-03 12:07:03 -0200
commit75d62fc04626c0c806a441b617c72e288bc35595 (patch)
tree80aeabea1da69c14b6681d6361dfc0a10e33ab0d /drivers
parenteae56684a000f2be0f62a7cfd427376b1fb02538 (diff)
downloadlinux-stable-75d62fc04626c0c806a441b617c72e288bc35595.tar.gz
linux-stable-75d62fc04626c0c806a441b617c72e288bc35595.tar.bz2
linux-stable-75d62fc04626c0c806a441b617c72e288bc35595.zip
[media] si2165: move setting ts config to init
The TS config is fixed, so no need to write it for each tune. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb-frontends/si2165.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 07247e307f55..0c1f4c41db17 100644
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -690,6 +690,20 @@ static int si2165_init(struct dvb_frontend *fe)
goto error;
}
+ /* ts output config */
+ ret = si2165_writereg8(state, 0x04e4, 0x20);
+ if (ret < 0)
+ return ret;
+ ret = si2165_writereg16(state, 0x04ef, 0x00fe);
+ if (ret < 0)
+ return ret;
+ ret = si2165_writereg24(state, 0x04f4, 0x555555);
+ if (ret < 0)
+ return ret;
+ ret = si2165_writereg8(state, 0x04e5, 0x01);
+ if (ret < 0)
+ return ret;
+
return 0;
error:
return ret;
@@ -824,19 +838,6 @@ static int si2165_set_frontend(struct dvb_frontend *fe)
ret = si2165_writereg8(state, 0x08f8, 0x00);
if (ret < 0)
return ret;
- /* ts output config */
- ret = si2165_writereg8(state, 0x04e4, 0x20);
- if (ret < 0)
- return ret;
- ret = si2165_writereg16(state, 0x04ef, 0x00fe);
- if (ret < 0)
- return ret;
- ret = si2165_writereg24(state, 0x04f4, 0x555555);
- if (ret < 0)
- return ret;
- ret = si2165_writereg8(state, 0x04e5, 0x01);
- if (ret < 0)
- return ret;
/* bandwidth in 10KHz steps */
ret = si2165_writereg16(state, 0x0308, bw10k);
if (ret < 0)