summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
deleted file mode 100644
index e8a58e5ccd..0000000000
--- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1# Signed-off-by: Khem Raj <raj.khem@gmail.com>
2#
3# Use the new usb1 API for usb_init() and check for fails from
4# usb_init (). Currently we see a crash on a system which does
5# not have USB because usb_init() fails and it cleans up all initialized
6# data (e.g. ctx) which is used in subsequent calls to libusb
7# We return immediately if usb_init() fails for some reason.
8
9Upstream-Status: Inappropriate [not used]
10
11Index: bluez-4.24/tools/hid2hci.c
12===================================================================
13--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700
14+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800
15@@ -337,7 +337,7 @@
16 int main(int argc, char *argv[])
17 {
18 struct device_info dev[16];
19- int i, opt, num, quiet = 0, mode = HCI;
20+ int i, ret, opt, num, quiet = 0, mode = HCI;
21
22 while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) {
23 switch (opt) {
24@@ -361,8 +361,9 @@
25 argc -= optind;
26 argv += optind;
27 optind = 0;
28-
29- usb_init();
30+ ret = libusb_init();
31+ if (ret < 0)
32+ return ret;
33
34 num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0]));
35 if (num <= 0) {