Skip to contentSkip to conversation

Patch "[media] adv7604: fix tx 5v detect regression" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Mar 5, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

[media] adv7604: fix tx 5v detect regression

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     adv7604-fix-tx-5v-detect-regression.patch

and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0ba4581c84cfb39fd527f6b3457f1c97f6356c04 Mon Sep 17 00:00:00 2001

From: Hans Verkuil <[email protected]>
Date: Wed, 10 Feb 2016 08:09:10 -0200
Subject: [media] adv7604: fix tx 5v detect regression

From: Hans Verkuil <[email protected]>

commit 0ba4581c84cfb39fd527f6b3457f1c97f6356c04 upstream.

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.

---
 drivers/media/i2c/adv7604.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/i2c/adv7604.c +1 -2
@@ -1960,10 +1960,9 @@ static int adv76xx_isr(struct v4l2_subde
 	}
 
 	/* 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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/adv7604-fix-tx-5v-detect-regression.patch