X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/e2e192a23633acd8606748a6e9399d5e20a52ae8..12521481f11d23c8afbb6f21659ca901a9663959:/src/am7xxx.c diff --git a/src/am7xxx.c b/src/am7xxx.c index b988267..2d7b890 100644 --- a/src/am7xxx.c +++ b/src/am7xxx.c @@ -800,7 +800,7 @@ static int open_device(am7xxx_context *ctx, } if (current_configuration != (*dev)->desc->configuration) { - debug(ctx, "libusb configuration changed (expected: %hhu, current: %hhu\n", + debug(ctx, "libusb configuration changed (expected: %hhu, current: %d)\n", (*dev)->desc->configuration, current_configuration); ret = -EINVAL; goto out_libusb_release_interface; @@ -1093,8 +1093,7 @@ AM7XXX_PUBLIC int am7xxx_init(am7xxx_context **ctx) *ctx = malloc(sizeof(**ctx)); if (*ctx == NULL) { fatal("cannot allocate the context (%s)\n", strerror(errno)); - ret = -ENOMEM; - goto out; + return -ENOMEM; } memset(*ctx, 0, sizeof(**ctx)); @@ -1261,7 +1260,6 @@ AM7XXX_PUBLIC int am7xxx_calc_scaled_image_dimensions(am7xxx_device *dev, unsigned int *scaled_width, unsigned int *scaled_height) { - am7xxx_device_info device_info; float width_ratio; float height_ratio;