diff options
| author | Michael Hunold <devnull@localhost> | 2003-04-26 11:23:43 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-04-26 11:23:43 +0000 |
| commit | b80a49661205204e9e4fdd47f887355f543ba4ad (patch) | |
| tree | 727a36b8683397e630e1a61187668977db74390b /linux/drivers/media/dvb/dvb-core | |
| parent | 3e4b7360a384416bdb35dded255c518c3863759e (diff) | |
| download | mediapointer-dvb-s2-b80a49661205204e9e4fdd47f887355f543ba4ad.tar.gz mediapointer-dvb-s2-b80a49661205204e9e4fdd47f887355f543ba4ad.tar.bz2 | |
Revert ddelay() cleanup, discuss this first with Holger.
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_compat.h | 12 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 6 |
2 files changed, 14 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_compat.h index b31a8ef10..cbbaee353 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_compat.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_compat.h @@ -10,6 +10,18 @@ /* necessary dummy functions due to the > 2.5.67 kernel i2c changes */ #define i2c_get_adapdata(adapter) (struct saa7146_dev*)adapter->data; +/** + * a sleeping delay function, waits i ms + * + */ +static +inline void ddelay(int i) +{ + current->state=TASK_INTERRUPTIBLE; + schedule_timeout((HZ*i)/1000); +} + + static inline void kernel_thread_setup (const char *thread_name) { diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index ef0acba79..98d15c9ed 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -195,10 +195,8 @@ void dvb_call_frontend_notifiers (struct dvb_frontend_data *fe, if ((fe->status & FE_HAS_LOCK) && !(s & FE_HAS_LOCK)) fe->lost_sync_jiffies = jiffies; - if (((s ^ fe->status) & FE_HAS_LOCK) && (s & FE_HAS_LOCK)) { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout (fe->info->notifier_delay/10); - } + if (((s ^ fe->status) & FE_HAS_LOCK) && (s & FE_HAS_LOCK)) + ddelay (fe->info->notifier_delay); fe->status = s; |