Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a025348 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a1f26765

drivers/media/usb/cx231xx/cx231xx-i2c.c

+10 −1
Original line number Diff line number Diff line
@@ -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)