X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/hmcfgusb/blobdiff_plain/816f5cd2ecb24d72753fed01597a81e031398446..4a8a2269f615db1d1e98e2214fea8c93bca4f7a5:/hmcfgusb.c

diff --git a/hmcfgusb.c b/hmcfgusb.c
index ace2e57..7ec0714 100644
--- a/hmcfgusb.c
+++ b/hmcfgusb.c
@@ -191,7 +191,6 @@ static struct libusb_transfer *hmcfgusb_prepare_int(libusb_device_handle *devh,
 	if (err != 0) {
 		fprintf(stderr, "Can't submit transfer: %s\n", usb_strerror(err));
 		libusb_free_transfer(transfer);
-		free(data_buf);
 		return NULL;
 	}
 
@@ -226,7 +225,17 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 		if (cb_data && cb_data->cb) {
 			if (debug)
 				hexdump(transfer->buffer, transfer->actual_length, "USB > ");
-			cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data);
+
+			if (!cb_data->cb(transfer->buffer, transfer->actual_length, cb_data->data)) {
+				quit = EIO;
+
+				if (cb_data && cb_data->dev && cb_data->dev->transfer) {
+					libusb_free_transfer(cb_data->dev->transfer);
+					cb_data->dev->transfer = NULL;
+				}
+
+				return;
+			}
 		} else {
 			hexdump(transfer->buffer, transfer->actual_length, "> ");
 		}
@@ -235,7 +244,6 @@ static void LIBUSB_CALL hmcfgusb_interrupt(struct libusb_transfer *transfer)
 	err = libusb_submit_transfer(transfer);
 	if (err != 0) {
 		fprintf(stderr, "Can't re-submit transfer: %s\n", usb_strerror(err));
-		free(transfer->buffer);
 		libusb_free_transfer(transfer);
 	}
 }
@@ -317,6 +325,8 @@ struct hmcfgusb_dev *hmcfgusb_init(hmcfgusb_cb_fn cb, void *data)
 
 	dev->n_pfd = dev->n_usb_pfd;
 
+	quit = 0;
+
 	return dev;
 }