adv7604: fix tx 5v detect regression

PATCH New Hans Verkuil 1 participant 1 message Feb 10, 2016

Subsystems (2)

Media (V4L/DVB) Analog devices inc ADV7604 driver

lore

Share & tools

lore

Hans Verkuil

author

2016-02-10 10:09 UTC #0 lore raw

PATCH 1/1 adv7604: fix tx 5v detect regression

The 5 volt detect functionality broke in 3.14: the code reads IO register 0x70 again after it has already been cleared. Instead it should use the cached irq_reg_0x70 value and the io_write to 0x71 to clear 0x70 can be dropped since this has already been done.

Signed-off-by Hans Verkuil <[email protected]>

Cc <[email protected]> # for v3.14 and up

---
 drivers/media/i2c/adv7604.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/media/i2c/adv7604.c +1 -2

index 45a3e12..9355553 100644
@@ -2199,10 +2199,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
 	adv76xx_cec_isr(sd, handled);
 
 	/* tx 5v detect */
-	tx_5v = io_read(sd, 0x70) & info->cable_det_mask;
+	tx_5v = irq_reg_0x70 & info->cable_det_mask;
 	if (tx_5v) {
 		v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);
-		io_write(sd, 0x71, tx_5v);
 		adv76xx_s_detect_tx_5v_ctrl(sd);
 		if (handled)
 			*handled = true;

Signature · 1 line

2.6.1