From 4bdf3ad6277e324dc0348e11522c9ab0dd5306ac Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 19 May 2008 22:13:02 -0300 Subject: [PATCH] --- yaml --- r: 97729 b: refs/heads/master c: 7f3917f6484938d56cb5ab660f476c1dfa445a81 h: refs/heads/master i: 97727: 55ff33c5622a2c18dd1485c19aa2b26521ac9bdf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-gpio.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 69d1a632dd9b..e0d1078e859e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b4a9714f43a1d675a4352260a12daae197f37c3 +refs/heads/master: 7f3917f6484938d56cb5ab660f476c1dfa445a81 diff --git a/trunk/drivers/media/video/cx18/cx18-gpio.c b/trunk/drivers/media/video/cx18/cx18-gpio.c index bb8bc86086d0..1e0d32b992f9 100644 --- a/trunk/drivers/media/video/cx18/cx18-gpio.c +++ b/trunk/drivers/media/video/cx18/cx18-gpio.c @@ -62,12 +62,14 @@ void cx18_gpio_init(struct cx18 *cx) gpio_dir = cx->card->gpio_init.direction; gpio_val = cx->card->gpio_init.initial_value; + if (cx->card->xceive_pin) { + gpio_dir |= 1 << cx->card->xceive_pin; + gpio_val |= 1 << cx->card->xceive_pin; + } + if (gpio_dir == 0) return; - gpio_dir |= 1 << cx->card->xceive_pin; - gpio_val |= 1 << cx->card->xceive_pin; - CX18_DEBUG_INFO("GPIO initial dir: %08x/%08x out: %08x/%08x\n", read_reg(CX18_REG_GPIO_DIR1), read_reg(CX18_REG_GPIO_DIR2), read_reg(CX18_REG_GPIO_OUT1), read_reg(CX18_REG_GPIO_OUT2));