gphoto2-device-return.patch 934 B

123456789101112131415161718192021222324252627282930313233
  1. From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
  2. From: Lubomir Rintel <lkundrak@v3.sk>
  3. Date: Fri, 23 Oct 2009 13:12:16 +0200
  4. Subject: [PATCH] Repair reattach of kernel driver if it was unbound
  5. Drah in the header for USBDEVFS_CONNECT.
  6. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
  7. ---
  8. libgphoto2_port/usb/libusb.c | 6 ++++++
  9. 1 files changed, 6 insertions(+), 0 deletions(-)
  10. diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
  11. index d1535a5..c8a63f1 100644
  12. --- a/libgphoto2_port/usb/libusb.c
  13. +++ b/libgphoto2_port/usb/libusb.c
  14. @@ -38,6 +38,12 @@
  15. #include <gphoto2/gphoto2-port-result.h>
  16. #include <gphoto2/gphoto2-port-log.h>
  17. +#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
  18. +/* Pull in USBDEVFS_CONNECT */
  19. +#include <sys/ioctl.h>
  20. +#include <linux/usbdevice_fs.h>
  21. +#endif
  22. +
  23. #ifdef ENABLE_NLS
  24. # include <libintl.h>
  25. # undef _
  26. --
  27. 1.6.5.rc2