tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

Mauro Carvalho Chehab 9d32069f 15472faf

+7 -9
+7 -9
drivers/media/dvb-frontends/mb86a20s.c
··· 157 157 { 0x45, 0x04 }, /* CN symbol 4 */ 158 158 { 0x48, 0x04 }, /* CN manual mode */ 159 159 160 - { 0x50, 0xd5 }, { 0x51, 0x01 }, /* Serial */ 161 160 { 0x50, 0xd6 }, { 0x51, 0x1f }, 162 161 { 0x50, 0xd2 }, { 0x51, 0x03 }, 163 162 { 0x50, 0xd7 }, { 0x51, 0xbf }, ··· 1859 1860 dev_dbg(&state->i2c->dev, "%s: IF=%d, IF reg=0x%06llx\n", 1860 1861 __func__, state->if_freq, (long long)pll); 1861 1862 1862 - if (!state->config->is_serial) { 1863 + if (!state->config->is_serial) 1863 1864 regD5 &= ~1; 1864 1865 1865 - rc = mb86a20s_writereg(state, 0x50, 0xd5); 1866 - if (rc < 0) 1867 - goto err; 1868 - rc = mb86a20s_writereg(state, 0x51, regD5); 1869 - if (rc < 0) 1870 - goto err; 1871 - } 1866 + rc = mb86a20s_writereg(state, 0x50, 0xd5); 1867 + if (rc < 0) 1868 + goto err; 1869 + rc = mb86a20s_writereg(state, 0x51, regD5); 1870 + if (rc < 0) 1871 + goto err; 1872 1872 1873 1873 rc = mb86a20s_writeregdata(state, mb86a20s_init2); 1874 1874 if (rc < 0)