diff options
| author | Antonio Ospite <ao2@ao2.it> | 2014-06-24 13:28:40 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-06-25 21:21:17 +0200 |
| commit | 50764650c9e6e8498d273ad714f68ee8eec96692 (patch) | |
| tree | fc831d52e4713077b4d4779ac4c5326c348f87eb /drivers/hid | |
| parent | d6b92c2c373e0beefa8048c1448992cd5cda6e07 (diff) | |
| download | talos-op-linux-50764650c9e6e8498d273ad714f68ee8eec96692.tar.gz talos-op-linux-50764650c9e6e8498d273ad714f68ee8eec96692.zip | |
HID: sony: Use the SIXAXIS_CONTROLLER constant when possible
Instead of checking for SIXAXIS_CONTROLLER_USB and SIXAXIS_CONTROLLER_BT
separately, a check on SIXAXIS_CONTROLLER can be used when setting
connect_mask.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-sony.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 2259eaa8b988..a77269b06880 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -1830,9 +1830,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) if (sc->quirks & VAIO_RDESC_CONSTANT) connect_mask |= HID_CONNECT_HIDDEV_FORCE; - else if (sc->quirks & SIXAXIS_CONTROLLER_USB) - connect_mask |= HID_CONNECT_HIDDEV_FORCE; - else if (sc->quirks & SIXAXIS_CONTROLLER_BT) + else if (sc->quirks & SIXAXIS_CONTROLLER) connect_mask |= HID_CONNECT_HIDDEV_FORCE; ret = hid_hw_start(hdev, connect_mask); |
