From ac2b84bdf8ffa5502f7617975c39120e84d295c8 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 21 Nov 2012 18:20:17 +0100 Subject: [PATCH] Fix hid2hci not working with recent kernels (#877998) --- ...ubsystem-in-udev-rule-from-usb-to-us.patch | 32 +++++++++++++++++++ bluez.spec | 4 +++ 2 files changed, 36 insertions(+) create mode 100644 0001-hid2hci-change-subsystem-in-udev-rule-from-usb-to-us.patch diff --git a/0001-hid2hci-change-subsystem-in-udev-rule-from-usb-to-us.patch b/0001-hid2hci-change-subsystem-in-udev-rule-from-usb-to-us.patch new file mode 100644 index 0000000..f8fcada --- /dev/null +++ b/0001-hid2hci-change-subsystem-in-udev-rule-from-usb-to-us.patch @@ -0,0 +1,32 @@ +From d557e0d956d69318664ed5d1c3e4a765da24bc2a Mon Sep 17 00:00:00 2001 +From: Alexander Holler +Date: Tue, 20 Nov 2012 12:47:08 +0100 +Subject: [PATCH] hid2hci: change subsystem in udev rule from usb to usb* + +With kernel 3.6 (commit 7e97243c2080ecae7129e83635227fdebd4feef6) the +class for some devices (e.g. dongles from Logitech) were changed from +usb to usbmisc. As consequence the udev rule for hid2hci didn't work +anymore with kernels >= 3.6. + +Changing the subsystem from "usb" to "usb*" matches both "usb" and +"usbmisc" and works with all kernels. +--- + scripts/bluetooth-hid2hci.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/bluetooth-hid2hci.rules b/scripts/bluetooth-hid2hci.rules +index 0687c8a..db6bb03 100644 +--- a/scripts/bluetooth-hid2hci.rules ++++ b/scripts/bluetooth-hid2hci.rules +@@ -1,7 +1,7 @@ + # do not edit this file, it will be overwritten on update + + ACTION=="remove", GOTO="hid2hci_end" +-SUBSYSTEM!="usb", GOTO="hid2hci_end" ++SUBSYSTEM!="usb*", GOTO="hid2hci_end" + + # Variety of Dell Bluetooth devices - match on a mouse device that is + # self powered and where a HID report needs to be sent to switch modes +-- +1.8.0 + diff --git a/bluez.spec b/bluez.spec index 240dd0c..030d1af 100644 --- a/bluez.spec +++ b/bluez.spec @@ -16,6 +16,8 @@ Source8: bluez-uinput.modules # https://bugzilla.redhat.com/show_bug.cgi?id=874015#c0 Patch0: bluez-4.101-allow-a2dp-with-pulseaudio.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=877998 +Patch1: 0001-hid2hci-change-subsystem-in-udev-rule-from-usb-to-us.patch # https://bugzilla.redhat.com/show_bug.cgi?id=498756 Patch4: bluez-socket-mobile-cf-connection-kit.patch # http://thread.gmane.org/gmane.linux.bluez.kernel/2396 @@ -148,6 +150,7 @@ and mouse. %setup -q %patch0 -p1 +%patch1 -p1 %patch4 -p1 -b .socket-mobile %patch5 -p1 -b .cable-pairing %patch6 -p1 @@ -324,6 +327,7 @@ fi - Clean up requires and build requires - Use CUPS macro (#772236) - Enable audio socket so a2dp works in PulseAudio again (#874015) +- Fix hid2hci not working with recent kernels (#877998) * Wed Aug 15 2012 Bastien Nocera 4.101-3 - Enable pairing Wiimote support (#847481)