X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.c;h=98b9aad134c8f1832ddd0e44d0e6e733bf896181;hb=c532476aa7b9a4afb1f32d5b634348d3e825d6bb;hp=e0956b38c7c1c2f7faf82ac6c54c4cbbb6a19b26;hpb=133a37bfba1a7e1423716b2b872d3bb82a2e64d9;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.c b/hardware/saleae-logic/saleae-logic.c
index e0956b38..98b9aad1 100644
--- a/hardware/saleae-logic/saleae-logic.c
+++ b/hardware/saleae-logic/saleae-logic.c
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,7 +94,7 @@ static libusb_context *usb_context = NULL;
 static int new_saleae_logic_firmware = 0;
 
 static int hw_set_configuration(int device_index, int capability, void *value);
-static void hw_stop_acquisition(int device_index, gpointer session_device_id);
+static int hw_stop_acquisition(int device_index, gpointer session_device_id);
 
 /**
  * Check the USB configuration to determine if this is a Saleae Logic.
@@ -460,16 +460,28 @@ static int hw_closedev(int device_index)
 	return SR_OK;
 }
 
-static void hw_cleanup(void)
+static int hw_cleanup(void)
 {
 	GSList *l;
 	struct sr_device_instance *sdi;
 	struct fx2_device *fx2;
+	int ret = SR_OK;
 
 	/* Properly close and free all devices. */
 	for (l = device_instances; l; l = l->next) {
-		sdi = l->data;
-		fx2 = sdi->priv;
+		if (!(sdi = l->data)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("fx2: %s: sdi was NULL, continuing", __func__);
+			ret = SR_ERR_BUG;
+			continue;
+		}
+		if (!(fx2 = sdi->priv)) {
+			/* Log error, but continue cleaning up the rest. */
+			sr_err("fx2: %s: sdi->priv was NULL, continuing",
+			       __func__);
+			ret = SR_ERR_BUG;
+			continue;
+		}
 		close_device(sdi);
 		sr_usb_device_instance_free(fx2->usb);
 		sr_device_instance_free(sdi);
@@ -481,6 +493,8 @@ static void hw_cleanup(void)
 	if (usb_context)
 		libusb_exit(usb_context);
 	usb_context = NULL;
+
+	return ret;
 }
 
 static void *hw_get_device_info(int device_index, int device_info_id)
@@ -856,7 +870,7 @@ static int hw_start_acquisition(int device_index, gpointer session_data)
 }
 
 /* This stops acquisition on ALL devices, ignoring device_index. */
-static void hw_stop_acquisition(int device_index, gpointer session_data)
+static int hw_stop_acquisition(int device_index, gpointer session_data)
 {
 	struct sr_datafeed_packet packet;
 
@@ -869,6 +883,8 @@ static void hw_stop_acquisition(int device_index, gpointer session_data)
 	receive_transfer(NULL);
 
 	/* TODO: Need to cancel and free any queued up transfers. */
+
+	return SR_OK;
 }
 
 SR_PRIV struct sr_device_plugin saleae_logic_plugin_info = {