diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2013-07-24 10:53:07 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-24 10:57:09 -0400 |
commit | 6f498018279d118cf38945f73da7c9345f7e2e5d (patch) | |
tree | 635ca815e29a2bf7cf65e7f15b4f1e7d547c4183 /drivers/hid | |
parent | 3366dd9fa887ebbda4872e9554f853eaeda764be (diff) |
HID: sony: fix HID mapping for PS3 sixaxis controller
Commit f04d51404f51 (HID: driver for PS2/3 Buzz controllers) introduced
an input_mapping() callback, but set the return value to -1 to all devices
except the Buzz controllers. The result of this is that the Sixaxis input
device is not populated, making it useless.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-sony.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index ecbc74923d06..87fbe2924cfa 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
@@ -369,7 +369,8 @@ static int sony_mapping(struct hid_device *hdev, struct hid_input *hi, | |||
369 | if (sc->quirks & PS3REMOTE) | 369 | if (sc->quirks & PS3REMOTE) |
370 | return ps3remote_mapping(hdev, hi, field, usage, bit, max); | 370 | return ps3remote_mapping(hdev, hi, field, usage, bit, max); |
371 | 371 | ||
372 | return -1; | 372 | /* Let hid-core decide for the others */ |
373 | return 0; | ||
373 | } | 374 | } |
374 | 375 | ||
375 | /* | 376 | /* |