depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

drivers: Print USB error when libusb_claim_interface() fails

Browse source 
https://bugs.freedesktop.org/show_bug.cgi?id=98594
This commit is contained in:
Bastien Nocera 2016-11-05 00:10:17 +01:00
parent 12f6dae8cd
commit a0bbbd7d32
19 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libfprint/drivers/aes1610.c
View file

@ -811,7 +811,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/aes1660.c
View file

@ -53,7 +53,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/aes2501.c
View file

@ -850,7 +850,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/aes2550.c
View file

@ -622,7 +622,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/aes2660.c
View file

@ -53,7 +53,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/aes3500.c
View file

@ -131,7 +131,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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)); aesdev = dev->priv = g_malloc0(sizeof(struct aes3k_dev));

2
libfprint/drivers/aes4000.c
View file

@ -128,7 +128,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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)); aesdev = dev->priv = g_malloc0(sizeof(struct aes3k_dev));

3
libfprint/drivers/etes603.c
View file

@ -1465,8 +1465,7 @@ static int dev_open(struct fp_img_dev *idev, unsigned long driver_data)
ret = libusb_claim_interface(idev->udev, 0); ret = libusb_claim_interface(idev->udev, 0);
if (ret != LIBUSB_SUCCESS) { if (ret != LIBUSB_SUCCESS) {
fp_err("libusb_claim_interface failed on interface 0 " fp_err("libusb_claim_interface failed on interface 0: %s", libusb_error_name(r));
"(err=%d)", ret);
return ret; return ret;
} }

6
libfprint/drivers/fdu2000.c
View file

@ -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 ) //if ( (r = usb_set_configuration(dev->udev, 1)) < 0 )
// goto out; // goto out;
if ( (r = libusb_claim_interface(dev->udev, 0)) < 0 ) if ( (r = libusb_claim_interface(dev->udev, 0)) < 0 ) {
goto out; fp_err("could not claim interface 0: %s", libusb_error_name(r));
return r;
}
//if ( (r = usb_set_altinterface(dev->udev, 1)) < 0 ) //if ( (r = usb_set_altinterface(dev->udev, 1)) < 0 )
// goto out; // goto out;

4
libfprint/drivers/upeke2.c
View file

@ -864,8 +864,10 @@ static int dev_init(struct fp_dev *dev, unsigned long driver_data)
int r; int r;
r = libusb_claim_interface(dev->udev, 0); 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; return r;
}
upekdev = g_malloc(sizeof(*upekdev)); upekdev = g_malloc(sizeof(*upekdev));
upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */ upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */

2
libfprint/drivers/upeksonly.c
View file

@ -1359,7 +1359,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/upektc.c
View file

@ -441,7 +441,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

2
libfprint/drivers/upektc_img.c
View file

@ -651,7 +651,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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; return r;
} }

4
libfprint/drivers/upekts.c
View file

@ -875,8 +875,10 @@ static int dev_init(struct fp_dev *dev, unsigned long driver_data)
int r; int r;
r = libusb_claim_interface(dev->udev, 0); 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; return r;
}
upekdev = g_malloc(sizeof(*upekdev)); upekdev = g_malloc(sizeof(*upekdev));
upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */ upekdev->seq = 0xf0; /* incremented to 0x00 before first cmd */

2
libfprint/drivers/uru4000.c
View file

@ -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); r = libusb_claim_interface(dev->udev, iface_desc->bInterfaceNumber);
if (r < 0) { if (r < 0) {
fp_err("interface claim failed"); fp_err("interface claim failed: %s", libusb_error_name(r));
goto out; goto out;
} }

2
libfprint/drivers/vcom5s.c
View file

@ -348,7 +348,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 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) if (r == 0)
fpi_imgdev_open_complete(dev, 0); fpi_imgdev_open_complete(dev, 0);

2
libfprint/drivers/vfs101.c
View file

@ -1504,7 +1504,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
if (r < 0) if (r < 0)
{ {
/* Interface not claimed, return error */ /* 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; return r;
} }

2
libfprint/drivers/vfs301.c
View file

@ -240,7 +240,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r < 0) { if (r < 0) {
/* Interface not claimed, return error */ /* 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; return r;
} }

2
libfprint/drivers/vfs5011.c
View file

@ -849,7 +849,7 @@ static int dev_open(struct fp_img_dev *dev, unsigned long driver_data)
r = libusb_claim_interface(dev->udev, 0); r = libusb_claim_interface(dev->udev, 0);
if (r != 0) { if (r != 0) {
fp_err("Failed to claim interface"); fp_err("Failed to claim interface: %s", libusb_error_name(r));
return r; return r;
} }