xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v4l_for_linus' into patchwork

Browse Source 
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
This commit is contained in:
Mauro Carvalho Chehab
2016-03-03 06:07:04 -03:00
parent 697fe725f3 58402b6e98
commit 664716ad01
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/i2c/adv7604.c
View File

@@ -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;