1 files changed, 19 insertions, 6 deletions

diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index bfb6beedd40b..c16c69e9d26c 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -947,6 +947,8 @@ static int rtl2832_slave_ts_ctrl(struct i2c_client *client, bool enable)
                         goto err;
         }
 
+        dev->slave_ts = enable;
+
         return 0;
 err:
         dev_dbg(&client->dev, "failed=%d\n", ret);
@@ -960,7 +962,7 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
         int ret;
         u8 u8tmp;
 
-        dev_dbg(&client->dev, "onoff=%d\n", onoff);
+        dev_dbg(&client->dev, "onoff=%d, slave_ts=%d\n", onoff, dev->slave_ts);
 
         /* enable / disable PID filter */
         if (onoff)
@@ -968,7 +970,10 @@ static int rtl2832_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
         else
                 u8tmp = 0x00;
 
-        ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp);
+        if (dev->slave_ts)
+                ret = regmap_update_bits(dev->regmap, 0x021, 0xc0, u8tmp);
+        else
+                ret = regmap_update_bits(dev->regmap, 0x061, 0xc0, u8tmp);
         if (ret)
                 goto err;
 
@@ -986,8 +991,8 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid,
         int ret;
         u8 buf[4];
 
-        dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d\n",
-                index, pid, onoff);
+        dev_dbg(&client->dev, "index=%d pid=%04x onoff=%d slave_ts=%d\n",
+                index, pid, onoff, dev->slave_ts);
 
         /* skip invalid PIDs (0x2000) */
         if (pid > 0x1fff || index > 32)
@@ -1003,14 +1008,22 @@ static int rtl2832_pid_filter(struct dvb_frontend *fe, u8 index, u16 pid,
         buf[1] = (dev->filters >>  8) & 0xff;
         buf[2] = (dev->filters >> 16) & 0xff;
         buf[3] = (dev->filters >> 24) & 0xff;
-        ret = regmap_bulk_write(dev->regmap, 0x062, buf, 4);
+
+        if (dev->slave_ts)
+                ret = regmap_bulk_write(dev->regmap, 0x022, buf, 4);
+        else
+                ret = regmap_bulk_write(dev->regmap, 0x062, buf, 4);
         if (ret)
                 goto err;
 
         /* add PID */
         buf[0] = (pid >> 8) & 0xff;
         buf[1] = (pid >> 0) & 0xff;
-        ret = regmap_bulk_write(dev->regmap, 0x066 + 2 * index, buf, 2);
+
+        if (dev->slave_ts)
+                ret = regmap_bulk_write(dev->regmap, 0x026 + 2 * index, buf, 2);
+        else
+                ret = regmap_bulk_write(dev->regmap, 0x066 + 2 * index, buf, 2);
         if (ret)
                 goto err;