[Pcsclite-cvs-commit] r5015 - /trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jun 18 19:05:32 2010
New Revision: 5015

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5015
Log:
use libusb_detach_kernel_driver() from libusb-1.0 instead of the *_np()
version

Modified:
    trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c

Modified: trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c?rev=5015&op=diff
==============================================================================
--- trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c (original)
+++ trunk/Drivers/ccid/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.c Fri Jun 18 19:05:32 2010
@@ -116,9 +116,8 @@
 		return rv;
 	}
 
-#ifdef HAVE_USB_DETACH_KERNEL_DRIVER_NP
 	printf("failed with error %d, trying to detach kernel driver ....\n", rv);
-	rv = libusb_detach_kernel_driver_np(usb, ifnum);
+	rv = libusb_detach_kernel_driver(usb, ifnum);
 	if (rv == 0)
 	{
 		printf("success, claiming interface again ...");
@@ -129,7 +128,7 @@
 			return rv;
 		}
 	}
-#endif
+
 	printf("failed with error %d, giving up.\n", rv);
 	return rv;
 }