diff --git a/libfprint/drivers/aes1610.c b/libfprint/drivers/aes1610.c index 56617530..50bc4834 100644 --- a/libfprint/drivers/aes1610.c +++ b/libfprint/drivers/aes1610.c @@ -811,7 +811,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/aes1660.c b/libfprint/drivers/aes1660.c index 8e63fe38..32bea4eb 100644 --- a/libfprint/drivers/aes1660.c +++ b/libfprint/drivers/aes1660.c @@ -53,7 +53,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/aes2501.c b/libfprint/drivers/aes2501.c index 6c852a51..f6e3edf4 100644 --- a/libfprint/drivers/aes2501.c +++ b/libfprint/drivers/aes2501.c @@ -850,7 +850,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/aes2550.c b/libfprint/drivers/aes2550.c index 965bdb07..387967ee 100644 --- a/libfprint/drivers/aes2550.c +++ b/libfprint/drivers/aes2550.c @@ -622,7 +622,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/aes2660.c b/libfprint/drivers/aes2660.c index 7cae59c9..efe9670a 100644 --- a/libfprint/drivers/aes2660.c +++ b/libfprint/drivers/aes2660.c @@ -53,7 +53,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/aes3500.c b/libfprint/drivers/aes3500.c index 6f4d6b07..05c204a3 100644 --- a/libfprint/drivers/aes3500.c +++ b/libfprint/drivers/aes3500.c @@ -131,7 +131,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); aesdev = dev->priv = g_malloc0(sizeof(struct aes3k_dev)); diff --git a/libfprint/drivers/aes4000.c b/libfprint/drivers/aes4000.c index b8496514..f1a9d061 100644 --- a/libfprint/drivers/aes4000.c +++ b/libfprint/drivers/aes4000.c @@ -128,7 +128,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); aesdev = dev->priv = g_malloc0(sizeof(struct aes3k_dev)); diff --git a/libfprint/drivers/etes603.c b/libfprint/drivers/etes603.c index aae0f0f4..44cacbcb 100644 --- a/libfprint/drivers/etes603.c +++ b/libfprint/drivers/etes603.c @@ -1465,8 +1465,7 @@ static int dev_open(struct fp_img_dev *idev, unsigned long driver_data) ret = libusb_claim_interface(idev->udev, 0); if (ret != LIBUSB_SUCCESS) { - fp_err("libusb_claim_interface failed on interface 0 " - "(err=%d)", ret); + fp_err("libusb_claim_interface failed on interface 0: %s", libusb_error_name(r)); return ret; } diff --git a/libfprint/drivers/fdu2000.c b/libfprint/drivers/fdu2000.c index ebd71031..e14b860e 100644 --- a/libfprint/drivers/fdu2000.c +++ b/libfprint/drivers/fdu2000.c @@ -264,8 +264,10 @@ gint dev_init(struct fp_img_dev *dev, unsigned long driver_data) //if ( (r = usb_set_configuration(dev->udev, 1)) < 0 ) // goto out; - if ( (r = libusb_claim_interface(dev->udev, 0)) < 0 ) - goto out; + if ( (r = libusb_claim_interface(dev->udev, 0)) < 0 ) { + fp_err("could not claim interface 0: %s", libusb_error_name(r)); + return r; + } //if ( (r = usb_set_altinterface(dev->udev, 1)) < 0 ) // goto out; diff --git a/libfprint/drivers/upeke2.c b/libfprint/drivers/upeke2.c index f6852058..3f05e809 100644 --- a/libfprint/drivers/upeke2.c +++ b/libfprint/drivers/upeke2.c @@ -864,8 +864,10 @@ static int dev_init(struct fp_dev *dev, unsigned long driver_data) int r; r = libusb_claim_interface(dev->udev, 0); - if (r < 0) + if (r < 0) { + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; + } upekdev = g_malloc(sizeof(*upekdev)); upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */ diff --git a/libfprint/drivers/upeksonly.c b/libfprint/drivers/upeksonly.c index 22ada5e2..5048a5c7 100644 --- a/libfprint/drivers/upeksonly.c +++ b/libfprint/drivers/upeksonly.c @@ -1359,7 +1359,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/upektc.c b/libfprint/drivers/upektc.c index 271cffb7..f3d9b8ab 100644 --- a/libfprint/drivers/upektc.c +++ b/libfprint/drivers/upektc.c @@ -441,7 +441,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/upektc_img.c b/libfprint/drivers/upektc_img.c index 31eddff0..18e271b6 100644 --- a/libfprint/drivers/upektc_img.c +++ b/libfprint/drivers/upektc_img.c @@ -651,7 +651,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/upekts.c b/libfprint/drivers/upekts.c index c191a2dd..b2971276 100644 --- a/libfprint/drivers/upekts.c +++ b/libfprint/drivers/upekts.c @@ -875,8 +875,10 @@ static int dev_init(struct fp_dev *dev, unsigned long driver_data) int r; r = libusb_claim_interface(dev->udev, 0); - if (r < 0) + if (r < 0) { + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; + } upekdev = g_malloc(sizeof(*upekdev)); upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */ diff --git a/libfprint/drivers/uru4000.c b/libfprint/drivers/uru4000.c index ccaa87f8..462b86ac 100644 --- a/libfprint/drivers/uru4000.c +++ b/libfprint/drivers/uru4000.c @@ -1285,7 +1285,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, iface_desc->bInterfaceNumber); if (r < 0) { - fp_err("interface claim failed"); + fp_err("interface claim failed: %s", libusb_error_name(r)); goto out; } diff --git a/libfprint/drivers/vcom5s.c b/libfprint/drivers/vcom5s.c index 4b442b23..1f127a8c 100644 --- a/libfprint/drivers/vcom5s.c +++ b/libfprint/drivers/vcom5s.c @@ -348,7 +348,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); if (r == 0) fpi_imgdev_open_complete(dev, 0); diff --git a/libfprint/drivers/vfs101.c b/libfprint/drivers/vfs101.c index 062bc426..3ee13e3b 100644 --- a/libfprint/drivers/vfs101.c +++ b/libfprint/drivers/vfs101.c @@ -1504,7 +1504,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data) if (r < 0) { /* Interface not claimed, return error */ - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/vfs301.c b/libfprint/drivers/vfs301.c index 04db05ec..833c05b0 100644 --- a/libfprint/drivers/vfs301.c +++ b/libfprint/drivers/vfs301.c @@ -240,7 +240,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r < 0) { /* Interface not claimed, return error */ - fp_err("could not claim interface 0"); + fp_err("could not claim interface 0: %s", libusb_error_name(r)); return r; } diff --git a/libfprint/drivers/vfs5011.c b/libfprint/drivers/vfs5011.c index efa3df23..fa1dcabc 100644 --- a/libfprint/drivers/vfs5011.c +++ b/libfprint/drivers/vfs5011.c @@ -849,7 +849,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data) r = libusb_claim_interface(dev->udev, 0); if (r != 0) { - fp_err("Failed to claim interface"); + fp_err("Failed to claim interface: %s", libusb_error_name(r)); return r; }