diff options
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 5 | ||||
| -rw-r--r-- | linux/include/linux/dvb/frontend.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index a7aa25c12..61b9f291a 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -25,7 +25,7 @@ #include <asm/processor.h> #include <asm/semaphore.h> #include <asm/errno.h> -#include <asm/string.h> +#include <linux/string.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/wait.h> @@ -436,6 +436,7 @@ int dvb_frontend_thread (void *data) fe->frontend.i2c->adapter->num, fe->frontend.i2c->id); kernel_thread_setup (name); + fe->thread = current; fe->lost_sync_count = -1; @@ -505,7 +506,7 @@ void dvb_frontend_stop (struct dvb_frontend_data *fe) while (fe->thread) { fe->exit = 1; wake_up_interruptible (&fe->wait_queue); - current->state = TASK_INTERRUPTIBLE; + set_current_state(TASK_INTERRUPTIBLE); schedule_timeout (5); if (signal_pending(current)) break; diff --git a/linux/include/linux/dvb/frontend.h b/linux/include/linux/dvb/frontend.h index a0f3157d0..3f6e61d93 100644 --- a/linux/include/linux/dvb/frontend.h +++ b/linux/include/linux/dvb/frontend.h @@ -26,7 +26,7 @@ #ifndef _DVBFRONTEND_H_ #define _DVBFRONTEND_H_ -#include <linux/types.h> +#include <asm/types.h> typedef enum fe_type { |