diff options
Diffstat (limited to 'drivers/media/dvb/pluto2/pluto2.c')
-rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 1c798219dc7c..7cb79ec685f0 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
@@ -294,13 +294,13 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets) | |||
294 | 294 | ||
295 | /* Workaround for broken hardware: | 295 | /* Workaround for broken hardware: |
296 | * [1] On startup NBPACKETS seems to contain an uninitialized value, | 296 | * [1] On startup NBPACKETS seems to contain an uninitialized value, |
297 | * but no packets have been transfered. | 297 | * but no packets have been transferred. |
298 | * [2] Sometimes (actually very often) NBPACKETS stays at zero | 298 | * [2] Sometimes (actually very often) NBPACKETS stays at zero |
299 | * although one packet has been transfered. | 299 | * although one packet has been transferred. |
300 | * [3] Sometimes (actually rarely), the card gets into an erroneous | 300 | * [3] Sometimes (actually rarely), the card gets into an erroneous |
301 | * mode where it continuously generates interrupts, claiming it | 301 | * mode where it continuously generates interrupts, claiming it |
302 | * has recieved nbpackets>TS_DMA_PACKETS packets, but no packet | 302 | * has received nbpackets>TS_DMA_PACKETS packets, but no packet |
303 | * has been transfered. Only a reset seems to solve this | 303 | * has been transferred. Only a reset seems to solve this |
304 | */ | 304 | */ |
305 | if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) { | 305 | if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) { |
306 | unsigned int i = 0; | 306 | unsigned int i = 0; |
@@ -332,7 +332,7 @@ static irqreturn_t pluto_irq(int irq, void *dev_id) | |||
332 | struct pluto *pluto = dev_id; | 332 | struct pluto *pluto = dev_id; |
333 | u32 tscr; | 333 | u32 tscr; |
334 | 334 | ||
335 | /* check whether an interrupt occured on this device */ | 335 | /* check whether an interrupt occurred on this device */ |
336 | tscr = pluto_readreg(pluto, REG_TSCR); | 336 | tscr = pluto_readreg(pluto, REG_TSCR); |
337 | if (!(tscr & (TSCR_DE | TSCR_OVR))) | 337 | if (!(tscr & (TSCR_DE | TSCR_OVR))) |
338 | return IRQ_NONE; | 338 | return IRQ_NONE; |
@@ -647,7 +647,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, | |||
647 | i2c_set_adapdata(&pluto->i2c_adap, pluto); | 647 | i2c_set_adapdata(&pluto->i2c_adap, pluto); |
648 | strcpy(pluto->i2c_adap.name, DRIVER_NAME); | 648 | strcpy(pluto->i2c_adap.name, DRIVER_NAME); |
649 | pluto->i2c_adap.owner = THIS_MODULE; | 649 | pluto->i2c_adap.owner = THIS_MODULE; |
650 | pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL; | ||
651 | pluto->i2c_adap.dev.parent = &pdev->dev; | 650 | pluto->i2c_adap.dev.parent = &pdev->dev; |
652 | pluto->i2c_adap.algo_data = &pluto->i2c_bit; | 651 | pluto->i2c_adap.algo_data = &pluto->i2c_bit; |
653 | pluto->i2c_bit.data = pluto; | 652 | pluto->i2c_bit.data = pluto; |