X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=backend.c;h=4d39502d399eb5386aa34f6b498d7c99de2722a9;hb=fbec8bd2f3ead02358df65240c2cf786c8267f54;hp=22f65a7c515174a6513c2f7d7c34d2fdb2584c74;hpb=55a6daf59f85449d99a62b0a3b6010980125d38d;p=libsigrok.git

diff --git a/backend.c b/backend.c
index 22f65a7c..4d39502d 100644
--- a/backend.c
+++ b/backend.c
@@ -173,12 +173,12 @@ static int sanity_check_all_drivers(void)
 			sr_err("No dev_close in driver %d ('%s').", i, d);
 			errors++;
 		}
-		if (!drivers[i]->info_get) {
-			sr_err("No info_get in driver %d ('%s').", i, d);
+		if (!drivers[i]->config_get) {
+			sr_err("No config_get in driver %d ('%s').", i, d);
 			errors++;
 		}
-		if (!drivers[i]->dev_config_set) {
-			sr_err("No dev_config_set in driver %d ('%s').", i, d);
+		if (!drivers[i]->config_set) {
+			sr_err("No config_set in driver %d ('%s').", i, d);
 			errors++;
 		}
 		if (!drivers[i]->dev_acquisition_start) {
@@ -244,14 +244,18 @@ SR_API int sr_init(struct sr_context **ctx)
 	ret = libusb_init(&context->libusb_ctx);
 	if (LIBUSB_SUCCESS != ret) {
 		sr_err("libusb_init() returned %s.\n", libusb_error_name(ret));
+		ret = SR_ERR;
 		goto done;
 	}
 #endif
 
 	*ctx = context;
+	context = NULL;
 	ret = SR_OK;
 
 done:
+	if (context)
+		g_free(context);
 	return ret;
 }