From 361d1aa96547f527f1c60a871db35c943bc07471 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 20 Apr 2015 16:42:02 +0200 Subject: [PATCH 1/1] am7xxx: fix the error path of the second configuration check Return a negative error value when the configuration check done after claiming the interface fails, and also fix the output messages. --- src/am7xxx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/am7xxx.c b/src/am7xxx.c index 6595ccf..1c3f704 100644 --- a/src/am7xxx.c +++ b/src/am7xxx.c @@ -774,9 +774,9 @@ static int open_device(am7xxx_context *ctx, current_configuration = -1; libusb_get_configuration((*dev)->usb_device, ¤t_configuration); if (current_configuration != (*dev)->desc->configuration) { - debug(ctx, "libusb configuration changed\n"); - debug(ctx, "Cannot claim interface %hhu\n", - (*dev)->desc->interface_number); + debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n", + (*dev)->desc->configuration, current_configuration); + ret = -EINVAL; goto out_libusb_close; } out: -- 2.1.4