diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/char/joystick | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/char/joystick')
| -rw-r--r-- | drivers/char/joystick/joystick.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/joystick/joystick.c b/drivers/char/joystick/joystick.c index 4d9d94aa1..941f1795d 100644 --- a/drivers/char/joystick/joystick.c +++ b/drivers/char/joystick/joystick.c @@ -42,8 +42,9 @@ #include <linux/malloc.h> #include <linux/mm.h> #include <linux/module.h> +#include <linux/version.h> #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0) -#include <asm/spinlock.h> +#include <linux/spinlock.h> #include <linux/poll.h> #endif @@ -525,8 +526,8 @@ static int js_read(struct inode *inode, struct file *file, char *buf, int count) if (GOF(curl->tail) == jd->bhead && curl->startup == jd->num_axes + jd->num_buttons) { + __set_current_state(TASK_INTERRUPTIBLE); add_wait_queue(&jd->wait, &wait); - current->state = TASK_INTERRUPTIBLE; while (GOF(curl->tail) == jd->bhead) { |