[media] cx231xx: let is_tuner check the real i2c port and not the i2c master number

Get used i2c port from bus_nr and status of port_3 switch.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c
index af9180f3bf30a0b5303ff18c8210c0fc53d80e88..9ade3acbc8775b4b7d14bff55d750eb47eed4399 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c
@@ -54,10 +54,19 @@ do {                                                        \
       }                                                \
 } while (0)
 
+static inline int get_real_i2c_port(struct cx231xx *dev, int bus_nr)
+{
+       if (bus_nr == 1)
+               return dev->port_3_switch_enabled ? I2C_1_MUX_3 : I2C_1_MUX_1;
+       return bus_nr;
+}
+
 static inline bool is_tuner(struct cx231xx *dev, struct cx231xx_i2c *bus,
                        const struct i2c_msg *msg, int tuner_type)
 {
-       if (bus->nr != dev->board.tuner_i2c_master)
+       int i2c_port = get_real_i2c_port(dev, bus->nr);
+
+       if (i2c_port != dev->board.tuner_i2c_master)
                return false;
 
        if (msg->addr != dev->board.tuner_addr)