diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
| commit | e671695e92889f4471901f0fd96b4495d60a6022 (patch) | |
| tree | b3c48e34b61237be7bf0869b8ff66bdc4dad2fb0 /linux/drivers/media/video/saa7134 | |
| parent | 4969b6d8d0847eb8f756b4424f6eef2f2fe85677 (diff) | |
| parent | 592120ae5b01a9f0001734872622bebda6855195 (diff) | |
| download | mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.gz mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/xc5000
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 7296eeba0..9ed2997f7 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -960,7 +960,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, struct saa7134_dev *dev; struct saa7134_mpeg_ops *mops; int err; - int mask; if (saa7134_devcount == SAA7134_MAXBOARDS) return -ENOMEM; @@ -1161,11 +1160,6 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, if (TUNER_ABSENT != dev->tuner_type) saa7134_i2c_call_clients(dev, TUNER_SET_STANDBY, NULL); - if (card(dev).gpiomask != 0) { - mask = card(dev).gpiomask; - saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); - saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, 0); - } return 0; fail4: |