diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 10:30:23 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 10:30:23 +0100 |
| commit | 6e34ebb5f0dfb6dd6904af94a4369e999e7ff378 (patch) | |
| tree | 7e90323b69c9152977fbf0e80b46cbf5b6adcc70 /drivers/hid | |
| parent | d412e50084953a984cf20b4eb8dc78a7da0e3976 (diff) | |
| parent | 6497dc3a5473a0a7948765c45c3dad9ef0395b28 (diff) | |
Merge branch 'upstream-fixes' into for-next
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-gyration.c | 5 | ||||
| -rw-r--r-- | drivers/hid/hidraw.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c index 3975e039c3dd..e88b951cd10d 100644 --- a/drivers/hid/hid-gyration.c +++ b/drivers/hid/hid-gyration.c @@ -43,6 +43,11 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi, case 0x048: gy_map_key_clear(KEY_MEDIA); break; case 0x049: gy_map_key_clear(KEY_CAMERA); break; case 0x04a: gy_map_key_clear(KEY_VIDEO); break; + case 0x05a: gy_map_key_clear(KEY_TEXT); break; + case 0x05b: gy_map_key_clear(KEY_RED); break; + case 0x05c: gy_map_key_clear(KEY_GREEN); break; + case 0x05d: gy_map_key_clear(KEY_YELLOW); break; + case 0x05e: gy_map_key_clear(KEY_BLUE); break; default: return 0; diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index b31178a47e4c..54409cba018c 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c @@ -522,12 +522,12 @@ void hidraw_disconnect(struct hid_device *hid) hidraw->exist = 0; + device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); + mutex_lock(&minors_lock); hidraw_table[hidraw->minor] = NULL; mutex_unlock(&minors_lock); - device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor)); - if (hidraw->open) { hid_hw_close(hid); wake_up_interruptible(&hidraw->wait); |