[bluez/f20] This update fixes Sixaxis PS3 joypad detection
Bastien Nocera
hadess at fedoraproject.org
Thu Dec 12 23:02:34 UTC 2013
commit a59274182fbc02caf802a3ace56edb809b6a7886
Author: Bastien Nocera <hadess at hadess.net>
Date: Thu Dec 12 17:53:44 2013 +0100
This update fixes Sixaxis PS3 joypad detection
0001-sixaxis-Fix-device-detection.patch | 38 +++++++++++++++++++++++++++++++
bluez.spec | 6 ++++-
2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-sixaxis-Fix-device-detection.patch b/0001-sixaxis-Fix-device-detection.patch
new file mode 100644
index 0000000..71dda86
--- /dev/null
+++ b/0001-sixaxis-Fix-device-detection.patch
@@ -0,0 +1,38 @@
+From 7416e015c0995e0ab24e9a42edde33151e22b315 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Thu, 12 Dec 2013 17:14:31 +0100
+Subject: [PATCH] sixaxis: Fix device detection
+
+After searching past the end of the structure, the loop sometimes
+found matches in the daemon's address space...
+
+This fixes the loop to end after the elements have been exhausted.
+---
+ plugins/sixaxis.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
+index 45fa170..1154c15 100644
+--- a/plugins/sixaxis.c
++++ b/plugins/sixaxis.c
+@@ -301,7 +301,7 @@ static int get_supported_device(struct udev_device *udevice, uint16_t *bus)
+ struct udev_device *hid_parent;
+ uint16_t vid, pid;
+ const char *hid_id;
+- int i;
++ guint i;
+
+ hid_parent = udev_device_get_parent_with_subsystem_devtype(udevice,
+ "hid", NULL);
+@@ -313,7 +313,7 @@ static int get_supported_device(struct udev_device *udevice, uint16_t *bus)
+ if (sscanf(hid_id, "%hx:%hx:%hx", bus, &vid, &pid) != 3)
+ return -1;
+
+- for (i = 0; G_N_ELEMENTS(devices); i++) {
++ for (i = 0; i < G_N_ELEMENTS(devices); i++) {
+ if (devices[i].vid == vid && devices[i].pid == pid)
+ return i;
+ }
+--
+1.8.4.2
+
diff --git a/bluez.spec b/bluez.spec
index 8ddd68b..bb754b8 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -3,7 +3,7 @@
Summary: Bluetooth utilities
Name: bluez
Version: 5.12
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://www.bluez.org/
@@ -18,6 +18,7 @@ Patch3: 0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
Patch4: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
Patch5: 0002-autopair-Don-t-handle-the-iCade.patch
Patch7: 0004-agent-Assert-possible-infinite-loop.patch
+Patch8: 0001-sixaxis-Fix-device-detection.patch
BuildRequires: git
BuildRequires: flex
@@ -232,6 +233,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/bluetooth/
/lib/udev/rules.d/97-hid2hci.rules
%changelog
+* Thu Dec 12 2013 Bastien Nocera <bnocera at redhat.com> 5.12-2
+- This update fixes Sixaxis PS3 joypad detection
+
* Wed Dec 11 2013 Bastien Nocera <bnocera at redhat.com> 5.12-1
- Update to 5.12
- Sixaxis PS3 joypad support is now upstream
More information about the scm-commits
mailing list