diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-01 14:17:44 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-01 14:17:44 +0100 |
commit | 4ae5537fffdc9c8dc11b26511c2c8a3196916071 (patch) | |
tree | fb602326e5fa42b25def6c5aed659420ee4effba /meta/packages/bluez/bluez4/hid2hci_usb_init.patch | |
parent | 3051258e33c6a39aa8f8f2e3fef21945b12fbe9e (diff) | |
download | openembedded-core-4ae5537fffdc9c8dc11b26511c2c8a3196916071.tar.gz openembedded-core-4ae5537fffdc9c8dc11b26511c2c8a3196916071.tar.bz2 openembedded-core-4ae5537fffdc9c8dc11b26511c2c8a3196916071.tar.xz openembedded-core-4ae5537fffdc9c8dc11b26511c2c8a3196916071.zip |
bluez: Update bluez4 version from OE.dev and drop bluez 3.x
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/bluez/bluez4/hid2hci_usb_init.patch')
-rw-r--r-- | meta/packages/bluez/bluez4/hid2hci_usb_init.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/packages/bluez/bluez4/hid2hci_usb_init.patch b/meta/packages/bluez/bluez4/hid2hci_usb_init.patch new file mode 100644 index 000000000..ed15fd5a1 --- /dev/null +++ b/meta/packages/bluez/bluez4/hid2hci_usb_init.patch @@ -0,0 +1,33 @@ +# Signed-off-by: Khem Raj <raj.khem@gmail.com> +# +# Use the new usb1 API for usb_init() and check for fails from +# usb_init (). Currently we see a crash on a system which does +# not have USB because usb_init() fails and it cleans up all initialized +# data (e.g. ctx) which is used in subsequent calls to libusb +# We return immediately if usb_init() fails for some reason. + +Index: bluez-4.24/tools/hid2hci.c +=================================================================== +--- bluez-4.24.orig/tools/hid2hci.c 2008-10-25 23:40:34.000000000 -0700 ++++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.000000000 -0800 +@@ -337,7 +337,7 @@ + int main(int argc, char *argv[]) + { + struct device_info dev[16]; +- int i, opt, num, quiet = 0, mode = HCI; ++ int i, ret, opt, num, quiet = 0, mode = HCI; + + while ((opt = getopt_long(argc, argv, "+01qh", main_options, NULL)) != -1) { + switch (opt) { +@@ -361,8 +361,9 @@ + argc -= optind; + argv += optind; + optind = 0; +- +- usb_init(); ++ ret = libusb_init(); ++ if (ret < 0) ++ return ret; + + num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0])); + if (num <= 0) { |