- return the dual-mode device to kernel once we don't use it (#530545)

gphoto2-device-return.patch

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

libgphoto2.spec

@@ -1,7 +1,7 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
 Version: 2.4.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
 Group: Development/Libraries
@@ -11,6 +11,7 @@ Patch1: gphoto2-pkgcfg.patch
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-device-return.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@ use libgphoto2.
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .device-return
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -160,6 +162,9 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 23 2009 Jindrich Novy <jnovy@redhat.com> 2.4.7-2
+- return the dual-mode device to kernel once we don't use it (#530545)
+
 * Tue Aug 18 2009 Jindrich Novy <jnovy@redhat.com> 2.4.7-1
 - update to 2.4.7
 - drop udev patch, applied upstream