From 7818a0c08b03c5727af85e94e75fd42e9d6eaf90 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Thu, 20 Aug 2015 12:16:23 -0400 Subject: [PATCH] Revert "hidraw: add a workaround for the logitech receivers" This reverts commit 5ce5e8afec932ebeebc9a3e78f26717efaa273c6. fixed due to f92674df1c4 "hidraw: make sure we're comparing products of the same int type" Signed-off-by: Benjamin Tissoires --- src/libratbag-hidraw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/libratbag-hidraw.c b/src/libratbag-hidraw.c index 8e38fb8f..d6f4bfc0 100644 --- a/src/libratbag-hidraw.c +++ b/src/libratbag-hidraw.c @@ -65,18 +65,9 @@ ratbag_open_hidraw(struct ratbag_device *ratbag) /* Check if the device actually matches the input node */ if (hid_id.bustype != ratbag->ids.bustype || - hid_id.vendor != ratbag->ids.vendor) { - errno -EINVAL; - goto err; - } - - /* On the Logitech receiver, the hid device has the pid of the - * receiver, not of the actual device */ - if (hid_id.product != ratbag->ids.product && - (hid_id.vendor == USB_VENDOR_ID_LOGITECH && - hid_id.product != USB_DEVICE_ID_UNIFYING_RECEIVER && - hid_id.product != USB_DEVICE_ID_UNIFYING_RECEIVER2)) { - errno = -EINVAL; + hid_id.vendor != ratbag->ids.vendor || + hid_id.product != ratbag->ids.product) { + errno = EINVAL; goto err; }