I would appreciate any comments from the janitor@sternweltens list.
Thanks,
Nish
Description: Replace dvb_delay() with msleep() to guarantee the
task delays the desired time.
Signed-off-by: Nishanth Aravamudan <[email protected]>
Signed-off-by: Maximilian Attems <[email protected]>
---
linux-2.6.9-rc2-bk7-max/drivers/media/dvb/ttpci/budget-ci.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/media/dvb/ttpci/budget-ci.c~msleep-drivers_media_dvb_ttpci_budget-ci drivers/media/dvb/ttpci/budget-ci.c
--- linux-2.6.9-rc2-bk7/drivers/media/dvb/ttpci/budget-ci.c~msleep-drivers_media_dvb_ttpci_budget-ci 2004-09-21 20:50:28.000000000 +0200
+++ linux-2.6.9-rc2-bk7-max/drivers/media/dvb/ttpci/budget-ci.c 2004-09-21 20:50:28.000000000 +0200
@@ -326,7 +326,7 @@ static int ciintf_slot_reset(struct dvb_
saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQHI);
budget_ci->slot_status = SLOTSTATUS_RESET;
budget_debiwrite(budget_ci, DEBICICTL, DEBIADDR_CICONTROL, 1, 0);
- dvb_delay(1);
+ msleep(1);
budget_debiwrite(budget_ci, DEBICICTL, DEBIADDR_CICONTROL, 1, CICONTROL_RESET);
saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTHI);
@@ -475,7 +475,7 @@ static void ciintf_deinit(struct budget_
saa7146_setgpio(saa, 0, SAA7146_GPIO_INPUT);
tasklet_kill(&budget_ci->ciintf_irq_tasklet);
budget_debiwrite(budget_ci, DEBICICTL, DEBIADDR_CICONTROL, 1, 0);
- dvb_delay(1);
+ msleep(1);
budget_debiwrite(budget_ci, DEBICICTL, DEBIADDR_CICONTROL, 1, CICONTROL_RESET);
// disable TS data stream to CI interface
_