diff options
| -rw-r--r-- | linux/drivers/media/dvb/av7110/av7110.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c index de9d40b31..d6cb1ebe7 100644 --- a/linux/drivers/media/dvb/av7110/av7110.c +++ b/linux/drivers/media/dvb/av7110/av7110.c @@ -677,7 +677,8 @@ TTBStop(av7110_t *av7110) if (--av7110->feeding) return av7110->feeding; saa7146_write(av7110->dev, MC1, MASK_20); // DMA3 off - saa7146_write(av7110->dev, MC1, MASK_28); // RPS0 off + +// saa7146_write(av7110->dev, MC1, MASK_28); // RPS0 off IER_DISABLE(av7110->dev, (MASK_07 | MASK_10)); /* @@ -1191,7 +1192,7 @@ void gpioirq (unsigned long data) ARM_ClearIrq(av7110); - IER_DISABLE(av7110->dev, MASK_10); + IER_DISABLE(av7110->dev, MASK_19); // saa7146_write(av7110->dev, IER, // saa7146_read(av7110->dev, IER) & ~MASK_19 ); saa7146_write(av7110->dev, ISR, MASK_19 ); @@ -4363,10 +4364,6 @@ int av7110_attach (struct saa7146_dev* dev) /* FIXME: speed ok? */ saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_480); - av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev, - av7110->dvb_adapter, 0); - - av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev, av7110->dvb_adapter, 0); if (!av7110->i2c_bus) { @@ -4653,7 +4650,7 @@ struct saa7146_extension av7110_extension = { .detach = av7110_detach, .ioctl = av7110_ioctl, - .irq_mask = MASK_07|MASK_10|MASK_19|MASK_03|MASK_27, + .irq_mask = MASK_07|MASK_10|MASK_19|MASK_03, // |MASK_27, .irq_func = av7110_irq, }; |