1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index d8ac09f3cce6..bc22905ea20f 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -146,15 +146,20 @@ int ivtv_reset_tuner_gpio(void *dev, int cmd, int value)
 
 void ivtv_gpio_init(struct ivtv *itv)
 {
-        if (itv->card->gpio_init.direction == 0)
+        u16 pin = 0;
+
+        if (itv->card->xceive_pin)
+                pin = 1 << itv->card->xceive_pin;
+
+        if ((itv->card->gpio_init.direction | pin) == 0)
                 return;
 
         IVTV_DEBUG_INFO("GPIO initial dir: %08x out: %08x\n",
                    read_reg(IVTV_REG_GPIO_DIR), read_reg(IVTV_REG_GPIO_OUT));
 
         /* init output data then direction */
-        write_reg(itv->card->gpio_init.initial_value, IVTV_REG_GPIO_OUT);
-        write_reg(itv->card->gpio_init.direction, IVTV_REG_GPIO_DIR);
+        write_reg(itv->card->gpio_init.initial_value | pin, IVTV_REG_GPIO_OUT);
+        write_reg(itv->card->gpio_init.direction | pin, IVTV_REG_GPIO_DIR);
 }
 
 static struct v4l2_queryctrl gpio_ctrl_mute = {