Fix hid2hci rules harder

Commit 2b463cb0 changed the rules to match against hiddev* for all devices in
an attempt to fix Debian #567237/LP #444420. However, this caused regressions
with other devices (e. g. LP #550288) and thus was reverted in commit 8b56ba.

Now use hidraw* for the devices where it's confirmed that they only work with
that, and hiddev* for the others.

https://launchpad.net/bugs/444420

diff --git a/extras/hid2hci/70-hid2hci.rules b/extras/hid2hci/70-hid2hci.rules
index 72e70a0465b420a638f89eaea4ccdea25d959832..c5528f023b978bcf413608393b266f614a7d1ebd 100644 (file)
--- a/extras/hid2hci/70-hid2hci.rules
+++ b/extras/hid2hci/70-hid2hci.rules
@@ -11,7 +11,9 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt
   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
 
 # Logitech devices (hidraw)
-KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345bce]|c71[34bc]", \
+  RUN+="hid2hci --method=logitech-hid --devpath=%p"
+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70a", \
   RUN+="hid2hci --method=logitech-hid --devpath=%p"
 
 ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"