summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2010-09-27 01:48:38 +0200
committerMauro Carvalho Chehab2010-10-21 05:17:42 +0200
commit78bb6df6f2dd390a3480249187a055c385c0618a (patch)
treece743cfd341d415c19ae1298fbc4207ae58f4609 /drivers/media/video/cx231xx/cx231xx-cards.c
parent[media] cx231xx: better handle the master port enable command (diff)
downloadkernel-qcow2-linux-78bb6df6f2dd390a3480249187a055c385c0618a.tar.gz
kernel-qcow2-linux-78bb6df6f2dd390a3480249187a055c385c0618a.tar.xz
kernel-qcow2-linux-78bb6df6f2dd390a3480249187a055c385c0618a.zip
[media] cx231xx: Only change gpio direction when needed
Acked-by: Sri Deevi <Srinivasa.Deevi@conexant.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-cards.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-cards.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c
index 8e088db1a568..28f77a7f6572 100644
--- a/drivers/media/video/cx231xx/cx231xx-cards.c
+++ b/drivers/media/video/cx231xx/cx231xx-cards.c
@@ -495,10 +495,11 @@ void cx231xx_pre_card_setup(struct cx231xx *dev)
if (dev->board.tuner_gpio) {
cx231xx_set_gpio_direction(dev, dev->board.tuner_gpio->bit, 1);
cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit, 1);
+ }
+ if (dev->board.tuner_sif_gpio >= 0)
cx231xx_set_gpio_direction(dev, dev->board.tuner_sif_gpio, 1);
- /* request some modules if any required */
- }
+ /* request some modules if any required */
/* set the mode to Analog mode initially */
cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);