summaryrefslogtreecommitdiff
path: root/drivers/media/i2c/adv7604.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 12:07:04 +0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-03-03 12:07:41 +0300
commit664716ad013fceaa9e554100a42f99a460de3440 (patch)
tree9a2753e12d7891bf30d2e4dce0621385edef3830 /drivers/media/i2c/adv7604.c
parent697fe725f37aaa5fb15f581bc6e5b588f5fc8f7b (diff)
parent58402b6e98f9059420e64b296db6c4cb6f6c1117 (diff)
downloadlinux-664716ad013fceaa9e554100a42f99a460de3440.tar.xz
Merge branch 'v4l_for_linus' into patchwork
We need to import the changes at media.h, as we have a followup patch that depends on it. * v4l_for_linus: [media] media.h: use hex values for range offsets, move connectors base up. [media] adv7604: fix tx 5v detect regression
Diffstat (limited to 'drivers/media/i2c/adv7604.c')
-rw-r--r--drivers/media/i2c/adv7604.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index d35e0ba8b269..befb07df036d 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -1946,10 +1946,9 @@ static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *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;