diff options
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stv0299.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 0f508a728..d84da3ee1 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -35,9 +35,13 @@ */ +#include <asm/errno.h> #include <linux/init.h> +#include <linux/kernel.h> #include <linux/module.h> +#include <linux/string.h> +#include "compat.h" #include "dvb_frontend.h" static int debug = 0; @@ -435,8 +439,7 @@ int stv0299_wait_diseqc_fifo (struct dvb_i2c_bus *i2c, int timeout) dprintk ("%s: timeout!!\n", __FUNCTION__); return -ETIMEDOUT; } - current->state = TASK_INTERRUPTIBLE; - schedule_timeout (1); + ddelay(10); }; return 0; @@ -455,8 +458,7 @@ int stv0299_wait_diseqc_idle (struct dvb_i2c_bus *i2c, int timeout) dprintk ("%s: timeout!!\n", __FUNCTION__); return -ETIMEDOUT; } - current->state = TASK_INTERRUPTIBLE; - schedule_timeout (1); + ddelay(10); }; return 0; @@ -692,7 +694,7 @@ int uni0299_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg) dprintk ("AGC2I: 0x%02x%02x, signal=0x%04x\n", stv0299_readreg (i2c, 0x18), - stv0299_readreg (i2c, 0x19), signal); + stv0299_readreg (i2c, 0x19), (int) signal); signal = signal * 5 / 4; *((u16*) arg) = (signal > 0xffff) ? 0xffff : |