diff options
| author | Vojtech Pavlik <vojtech@suse.cz> | 2004-09-16 19:10:08 +0200 |
|---|---|---|
| committer | Vojtech Pavlik <vojtech@suse.cz> | 2004-09-16 19:10:08 +0200 |
| commit | a21165ce22bea18419fc20f2b58b392680453ff4 (patch) | |
| tree | e35a63a15ae5861cd93175f9bee84722c1a86c1e /drivers/input/joydev.c | |
| parent | 5c5b9c24188adf7a37ad51844910f2dea4d0dfab (diff) | |
| parent | 8718a604d60d615845e9d6bacd7107f795560694 (diff) | |
Merge suse.cz:/data2/bk/linus into suse.cz:/data2/bk/input
Diffstat (limited to 'drivers/input/joydev.c')
| -rw-r--r-- | drivers/input/joydev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 5eb884656db8..3e47218e0d6a 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c @@ -232,8 +232,10 @@ static ssize_t joydev_read(struct file *file, char __user *buf, size_t count, lo && list->head == list->tail && (file->f_flags & O_NONBLOCK)) return -EAGAIN; - retval = wait_event_interruptible(list->joydev->wait, list->joydev->exist - && (list->startup < joydev->nabs + joydev->nkey || list->head != list->tail)); + retval = wait_event_interruptible(list->joydev->wait, + !list->joydev->exist || + list->startup < joydev->nabs + joydev->nkey || + list->head != list->tail); if (retval) return retval; |