diff options
Diffstat (limited to 'include/linux/uinput.h')
-rw-r--r-- | include/linux/uinput.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 4c2c82336d10..84876077027f 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h | |||
@@ -42,8 +42,7 @@ struct uinput_request { | |||
42 | int code; /* UI_FF_UPLOAD, UI_FF_ERASE */ | 42 | int code; /* UI_FF_UPLOAD, UI_FF_ERASE */ |
43 | 43 | ||
44 | int retval; | 44 | int retval; |
45 | wait_queue_head_t waitq; | 45 | struct completion done; |
46 | int completed; | ||
47 | 46 | ||
48 | union { | 47 | union { |
49 | int effect_id; | 48 | int effect_id; |
@@ -62,7 +61,7 @@ struct uinput_device { | |||
62 | 61 | ||
63 | struct uinput_request *requests[UINPUT_NUM_REQUESTS]; | 62 | struct uinput_request *requests[UINPUT_NUM_REQUESTS]; |
64 | wait_queue_head_t requests_waitq; | 63 | wait_queue_head_t requests_waitq; |
65 | struct semaphore requests_sem; | 64 | spinlock_t requests_lock; |
66 | }; | 65 | }; |
67 | #endif /* __KERNEL__ */ | 66 | #endif /* __KERNEL__ */ |
68 | 67 | ||