X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdevice.c;h=aa499c8d74252ad07a37cf54afbec3b1233196ce;hb=01f2adb07a66a4e8e8a6102c7f6bb905007d606a;hp=71221433ca0321c1ee6ca95fbab3cf335448885a;hpb=04891a997c137abb5fa423e7de7f5b9a0fd27a49;p=libsigrok.git

diff --git a/src/device.c b/src/device.c
index 71221433..aa499c8d 100644
--- a/src/device.c
+++ b/src/device.c
@@ -136,7 +136,9 @@ SR_API int sr_dev_channel_enable(struct sr_channel *channel, gboolean state)
 }
 
 /* Returns the next enabled channel, wrapping around if necessary. */
+/** @private */
 SR_PRIV struct sr_channel *sr_next_enabled_channel(const struct sr_dev_inst *sdi,
+
 		struct sr_channel *cur_channel)
 {
 	struct sr_channel *next_channel;
@@ -409,7 +411,8 @@ SR_PRIV struct sr_usb_dev_inst *sr_usb_dev_inst_new(uint8_t bus,
 /**
  * Free struct sr_usb_dev_inst * allocated by sr_usb_dev_inst().
  *
- * @param usb The struct sr_usb_dev_inst * to free. Must not be NULL.
+ * @param usb The struct sr_usb_dev_inst * to free. If NULL, this
+ *            function does nothing.
  *
  * @private
  */
@@ -488,6 +491,9 @@ SR_PRIV struct sr_usbtmc_dev_inst *sr_usbtmc_dev_inst_new(const char *device)
 /** @private */
 SR_PRIV void sr_usbtmc_dev_inst_free(struct sr_usbtmc_dev_inst *usbtmc)
 {
+	if (!usbtmc)
+		return;
+
 	g_free(usbtmc->device);
 	g_free(usbtmc);
 }