diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-09 07:53:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-22 11:06:29 -0400 |
commit | 9d32069faacdc81fe1dcb5d297c32a3ac81da8f0 (patch) | |
tree | 35756bb312f28f696f61fa057ff01e201da9442b /drivers/media/dvb-frontends | |
parent | 15472faf12591a3667fe729d66ae9bf48c8bd1bb (diff) |
[media] mb86a20s: Fix TS parallel mode
changeset 768e6dadd74 caused a regression on using mb86a20s
in parallel mode, as the parallel mode selection got
overriden by mb86a20s_init2.
Cc: stable@vger.kernel.org
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
-rw-r--r-- | drivers/media/dvb-frontends/mb86a20s.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/media/dvb-frontends/mb86a20s.c b/drivers/media/dvb-frontends/mb86a20s.c index 856374bd3676..2c7217fb1415 100644 --- a/drivers/media/dvb-frontends/mb86a20s.c +++ b/drivers/media/dvb-frontends/mb86a20s.c | |||
@@ -157,7 +157,6 @@ static struct regdata mb86a20s_init2[] = { | |||
157 | { 0x45, 0x04 }, /* CN symbol 4 */ | 157 | { 0x45, 0x04 }, /* CN symbol 4 */ |
158 | { 0x48, 0x04 }, /* CN manual mode */ | 158 | { 0x48, 0x04 }, /* CN manual mode */ |
159 | 159 | ||
160 | { 0x50, 0xd5 }, { 0x51, 0x01 }, /* Serial */ | ||
161 | { 0x50, 0xd6 }, { 0x51, 0x1f }, | 160 | { 0x50, 0xd6 }, { 0x51, 0x1f }, |
162 | { 0x50, 0xd2 }, { 0x51, 0x03 }, | 161 | { 0x50, 0xd2 }, { 0x51, 0x03 }, |
163 | { 0x50, 0xd7 }, { 0x51, 0xbf }, | 162 | { 0x50, 0xd7 }, { 0x51, 0xbf }, |
@@ -1860,16 +1859,15 @@ static int mb86a20s_initfe(struct dvb_frontend *fe) | |||
1860 | dev_dbg(&state->i2c->dev, "%s: IF=%d, IF reg=0x%06llx\n", | 1859 | dev_dbg(&state->i2c->dev, "%s: IF=%d, IF reg=0x%06llx\n", |
1861 | __func__, state->if_freq, (long long)pll); | 1860 | __func__, state->if_freq, (long long)pll); |
1862 | 1861 | ||
1863 | if (!state->config->is_serial) { | 1862 | if (!state->config->is_serial) |
1864 | regD5 &= ~1; | 1863 | regD5 &= ~1; |
1865 | 1864 | ||
1866 | rc = mb86a20s_writereg(state, 0x50, 0xd5); | 1865 | rc = mb86a20s_writereg(state, 0x50, 0xd5); |
1867 | if (rc < 0) | 1866 | if (rc < 0) |
1868 | goto err; | 1867 | goto err; |
1869 | rc = mb86a20s_writereg(state, 0x51, regD5); | 1868 | rc = mb86a20s_writereg(state, 0x51, regD5); |
1870 | if (rc < 0) | 1869 | if (rc < 0) |
1871 | goto err; | 1870 | goto err; |
1872 | } | ||
1873 | 1871 | ||
1874 | rc = mb86a20s_writeregdata(state, mb86a20s_init2); | 1872 | rc = mb86a20s_writeregdata(state, mb86a20s_init2); |
1875 | if (rc < 0) | 1873 | if (rc < 0) |