projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am7xxx: check the return value of libusb_get_configuration()
[libam7xxx.git]
/
src
/
am7xxx.c
diff --git
a/src/am7xxx.c
b/src/am7xxx.c
index
1c3f704
..
b00a6be
100644
(file)
--- a/
src/am7xxx.c
+++ b/
src/am7xxx.c
@@
-734,7
+734,14
@@
static int open_device(am7xxx_context *ctx,
*/
current_configuration = -1;
*/
current_configuration = -1;
- libusb_get_configuration((*dev)->usb_device, ¤t_configuration);
+ ret = libusb_get_configuration((*dev)->usb_device,
+ ¤t_configuration);
+ if (ret < 0) {
+ debug(ctx, "libusb_get_configuration failed: %s\n",
+ libusb_error_name(ret));
+ goto out_libusb_close;
+ }
+
if (current_configuration != (*dev)->desc->configuration) {
/*
* In principle kernel drivers bound to each interface should
if (current_configuration != (*dev)->desc->configuration) {
/*
* In principle kernel drivers bound to each interface should
@@
-772,7
+779,14
@@
static int open_device(am7xxx_context *ctx,
* http://libusb.sourceforge.net/api-1.0/caveats.html
*/
current_configuration = -1;
* http://libusb.sourceforge.net/api-1.0/caveats.html
*/
current_configuration = -1;
- libusb_get_configuration((*dev)->usb_device, ¤t_configuration);
+ ret = libusb_get_configuration((*dev)->usb_device,
+ ¤t_configuration);
+ if (ret < 0) {
+ debug(ctx, "libusb_get_configuration after claim failed: %s\n",
+ libusb_error_name(ret));
+ goto out_libusb_close;
+ }
+
if (current_configuration != (*dev)->desc->configuration) {
debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n",
(*dev)->desc->configuration, current_configuration);
if (current_configuration != (*dev)->desc->configuration) {
debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n",
(*dev)->desc->configuration, current_configuration);