- enable interrupts via pci configuration space directly after enabling the device as proposed in Documentation/pci.txt

- set n_i2c to 3 (tda10046)

1 files changed, 4 insertions, 4 deletions

diff --git a/linux/drivers/media/dvb/pluto2/pluto2.c b/linux/drivers/media/dvb/pluto2/pluto2.c
index 5deb9f996..5b89bcde9 100644
--- a/linux/drivers/media/dvb/pluto2/pluto2.c
+++ b/linux/drivers/media/dvb/pluto2/pluto2.c
@@ -344,8 +344,6 @@ static void __devinit pluto_enable_irqs(struct pluto *pluto)
 	val |= TSCR_IACK;
 
 	pluto_writereg(pluto, REG_TSCR, val);
-
-	pci_write_config_dword(pluto->pdev, 0x6c, 0x8000);
 }
 
 static void pluto_disable_irqs(struct pluto *pluto)
@@ -358,8 +356,6 @@ static void pluto_disable_irqs(struct pluto *pluto)
 	val |= TSCR_IACK;
 
 	pluto_writereg(pluto, REG_TSCR, val);
-
-	pci_write_config_dword(pluto->pdev, 0x6c, 0x0000);
 }
 
 static int __devinit pluto_hw_init(struct pluto *pluto)
@@ -488,6 +484,7 @@ static int pluto2_request_firmware(struct dvb_frontend *fe,
 static struct tda1004x_config pluto2_fe_config __devinitdata = {
 	.demod_address = I2C_ADDR_TDA10046 >> 1,
 	.invert = 1,
+	.n_i2c = 3,
 	.pll_set = lg_tdtpe001p_pll_set,
 	.request_firmware = pluto2_request_firmware,
 };
@@ -557,6 +554,9 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
 	if (ret < 0)
 		goto err_kfree;
 
+	/* enable interrupts */
+	pci_write_config_dword(pdev, 0x6c, 0x8000);
+
 	ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
 	if (ret < 0)
 		goto err_pci_disable_device;