projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adv7604: fix tx 5v detect regression
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
media
/
i2c
/
adv7604.c
diff --git
a/drivers/media/i2c/adv7604.c
b/drivers/media/i2c/adv7604.c
index 5631ec004eedb8a5c91a758d20ab1c9351e512bf..01adcdc52346634cda4c7553bab709faf0df59fc 100644
(file)
--- a/
drivers/media/i2c/adv7604.c
+++ b/
drivers/media/i2c/adv7604.c
@@
-1960,10
+1960,9
@@
static int adv76xx_isr(struct v4l2_subdev *sd, u32 status, bool *handled)
}
/* tx 5v detect */
}
/* tx 5v detect */
- tx_5v = i
o_read(sd, 0x70)
& info->cable_det_mask;
+ tx_5v = i
rq_reg_0x70
& info->cable_det_mask;
if (tx_5v) {
v4l2_dbg(1, debug, sd, "%s: tx_5v: 0x%x\n", __func__, tx_5v);
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;
adv76xx_s_detect_tx_5v_ctrl(sd);
if (handled)
*handled = true;