diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2008-04-18 06:25:38 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-24 19:25:13 +0200 |
| commit | 8fd76c4506817a93718fab0d6b3a55b9becc9f2c (patch) | |
| tree | 897f0a659dfa193230be6590443c3d675ba8c244 /drivers/macintosh | |
| parent | Input: i8042 - fix incorrect usage of strncpy and strncat (diff) | |
| download | linux-8fd76c4506817a93718fab0d6b3a55b9becc9f2c.tar.xz linux-8fd76c4506817a93718fab0d6b3a55b9becc9f2c.zip | |
Input: mac_hid - add lockdep annotation to emumousebtn
The mouse button emulation calls input device methods from an input
device. This causes funny lock nesting which is harmless as each
device has its own locks.
Give the nesting device its own lock classes so that lockdep will not
consider them the same.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/mac_hid.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index 89302309da92..f972ff377b63 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c @@ -103,6 +103,9 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down) return 0; } +static struct lock_class_key emumousebtn_event_class; +static struct lock_class_key emumousebtn_mutex_class; + static int emumousebtn_input_register(void) { int ret; @@ -111,6 +114,9 @@ static int emumousebtn_input_register(void) if (!emumousebtn) return -ENOMEM; + lockdep_set_class(emumousebtn->event_lock, &emumousebtn_event_class); + lockdep_set_class(emumousebtn->mutex, &emumousebtn_mutex_class); + emumousebtn->name = "Macintosh mouse button emulation"; emumousebtn->id.bustype = BUS_ADB; emumousebtn->id.vendor = 0x0001; |