aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 0a11b5514403..0dc52918ce68 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -261,7 +261,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
261 tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt, 261 tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt,
262 (unsigned long) budget_ci); 262 (unsigned long) budget_ci);
263 263
264 saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06); 264 SAA7146_IER_ENABLE(saa, MASK_06);
265 saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI); 265 saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);
266 266
267 return 0; 267 return 0;
@@ -277,7 +277,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)
277 struct saa7146_dev *saa = budget_ci->budget.dev; 277 struct saa7146_dev *saa = budget_ci->budget.dev;
278 struct input_dev *dev = budget_ci->ir.dev; 278 struct input_dev *dev = budget_ci->ir.dev;
279 279
280 saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_06); 280 SAA7146_IER_DISABLE(saa, MASK_06);
281 saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT); 281 saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
282 tasklet_kill(&budget_ci->ir.msp430_irq_tasklet); 282 tasklet_kill(&budget_ci->ir.msp430_irq_tasklet);
283 283
@@ -537,7 +537,7 @@ static int ciintf_init(struct budget_ci *budget_ci)
537 } else { 537 } else {
538 saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQHI); 538 saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQHI);
539 } 539 }
540 saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_03); 540 SAA7146_IER_ENABLE(saa, MASK_03);
541 } 541 }
542 542
543 // enable interface 543 // enable interface
@@ -569,7 +569,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)
569 569
570 // disable CI interrupts 570 // disable CI interrupts
571 if (budget_ci->ci_irq) { 571 if (budget_ci->ci_irq) {
572 saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_03); 572 SAA7146_IER_DISABLE(saa, MASK_03);
573 saa7146_setgpio(saa, 0, SAA7146_GPIO_INPUT); 573 saa7146_setgpio(saa, 0, SAA7146_GPIO_INPUT);
574 tasklet_kill(&budget_ci->ciintf_irq_tasklet); 574 tasklet_kill(&budget_ci->ciintf_irq_tasklet);
575 } 575 }