From 909416c29e7527c7d4b6da7b6f6a97bd88d7c01c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 31 Jan 2011 16:25:39 -0300 Subject: [PATCH] --- yaml --- r: 241841 b: refs/heads/master c: 38f5ddc1bf12887c0abe287de359e853e12fcc19 h: refs/heads/master i: 241839: bb405e67fb21e8fcb183d942f7978fabd5d4a8cf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-avcore.c | 2 ++ trunk/drivers/media/video/cx231xx/cx231xx.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fa9c438b5267..fb5c36910498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f86138706d3b5c85a69e72ca2959717372386dd +refs/heads/master: 38f5ddc1bf12887c0abe287de359e853e12fcc19 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c index b80bccfa9b2d..62843d39817c 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -1271,6 +1271,8 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3) int status = 0; bool current_is_port_3; + if (dev->board.dont_use_port_3) + is_port_3 = false; status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN, value, 4); if (status < 0) diff --git a/trunk/drivers/media/video/cx231xx/cx231xx.h b/trunk/drivers/media/video/cx231xx/cx231xx.h index b72503d625b5..e1c222b05204 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx.h +++ b/trunk/drivers/media/video/cx231xx/cx231xx.h @@ -357,6 +357,7 @@ struct cx231xx_board { unsigned int valid:1; unsigned int no_alt_vanc:1; unsigned int external_av:1; + unsigned int dont_use_port_3:1; unsigned char xclk, i2c_speed;