diff options
-rw-r--r-- | drivers/media/dvb/mantis/mantis_pci.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c index 6eecd54a4457..4873fa9586e0 100644 --- a/drivers/media/dvb/mantis/mantis_pci.c +++ b/drivers/media/dvb/mantis/mantis_pci.c | |||
@@ -183,20 +183,7 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev, | |||
183 | mantis->subsystem_device = pdev->subsystem_device; | 183 | mantis->subsystem_device = pdev->subsystem_device; |
184 | init_waitqueue_head(&mantis->i2c_wq); | 184 | init_waitqueue_head(&mantis->i2c_wq); |
185 | 185 | ||
186 | // CAM bypass | 186 | mantis_set_direction(mantis, 0); /* CAM bypass */ |
187 | //mmwrite(mmread(MANTIS_INT_MASK) | MANTIS_INT_IRQ1, MANTIS_INT_MASK); | ||
188 | dprintk(verbose, MANTIS_INFO, 0, "\ngpif status: %04x irqcfg: %04x\n", mmread(0x9c), mmread(0x98)); | ||
189 | if ((mmread(0x9c) & 0x200) != 0) { //CAM inserted | ||
190 | msleep_interruptible(1); | ||
191 | if ((mmread(0x9c) & 0x200) != 0) | ||
192 | mmwrite(((mmread(0x98) | 0x01) & ~0x02), 0x98); | ||
193 | else | ||
194 | mmwrite(((mmread(0x98) | 0x02) & ~0x01), 0x98); | ||
195 | |||
196 | } else { | ||
197 | mmwrite(((mmread(0x98) | 0x02) & ~0x01), 0x98); | ||
198 | } | ||
199 | mantis_set_direction(mantis, 0); | ||
200 | 187 | ||
201 | if (!latency) | 188 | if (!latency) |
202 | pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 32); | 189 | pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 32); |