diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /drivers/char/joystick | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'drivers/char/joystick')
| -rw-r--r-- | drivers/char/joystick/joystick.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/joystick/joystick.c b/drivers/char/joystick/joystick.c index aff1acd17..4d9d94aa1 100644 --- a/drivers/char/joystick/joystick.c +++ b/drivers/char/joystick/joystick.c @@ -491,7 +491,7 @@ static ssize_t js_read(struct file *file, char *buf, size_t count, loff_t *ppos) static int js_read(struct inode *inode, struct file *file, char *buf, int count) #endif { - struct wait_queue wait = { current, NULL }; + DECLARE_WAITQUEUE(wait, current); struct js_event *buff = (void *) buf; struct js_list *curl; struct js_dev *jd; @@ -1081,7 +1081,7 @@ int js_register_device(struct js_port *port, int number, int axes, int buttons, curd->next = NULL; curd->list = NULL; curd->port = port; - curd->wait = NULL; + init_waitqueue_head(&curd->wait); curd->open = open; curd->close = close; |