error.c: Simplify and shorten.

[libsigrok.git] / hardware / ikalogic-scanalogic2 / protocol.c

diff --git a/hardware/ikalogic-scanalogic2/protocol.c b/hardware/ikalogic-scanalogic2/protocol.c
index 75c78aca24c45b0ca611a58d2d396c7fc9ba4273..4ed690b6969a219ba89b3698e8e6ce39f563f194 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.c
+++ b/hardware/ikalogic-scanalogic2/protocol.c
@@ -292,7 +292,9 @@ SR_PRIV void sl2_receive_transfer_in( struct libusb_transfer *transfer)
                return;
        }
 
-       sr_spew("State changed from %i to %i.", devc->state, devc->next_state);
+       if (devc->state != devc->next_state)
+               sr_spew("State changed from %i to %i.",
+                       devc->state, devc->next_state);
        devc->state = devc->next_state;
 
        if (devc->state == STATE_WAIT_DATA_READY) {
@@ -421,7 +423,9 @@ SR_PRIV void sl2_receive_transfer_out( struct libusb_transfer *transfer)
                return;
        }
 
-       sr_spew("State changed from %i to %i.", devc->state, devc->next_state);
+       if (devc->state != devc->next_state)
+               sr_spew("State changed from %i to %i.",
+                       devc->state, devc->next_state);
        devc->state = devc->next_state;
 
        if (devc->state == STATE_IDLE) {
@@ -655,7 +659,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
                        USB_INTERFACE);
 
                if (ret < 0) {
-                       sr_err("Failed to detach kernel driver: %i.",
+                       sr_err("Failed to detach kernel driver: %s.",
                                libusb_error_name(ret));
                        libusb_close(usb.devhdl);
                        return SR_ERR;
@@ -734,7 +738,7 @@ SR_PRIV int sl2_get_device_info(struct sr_usb_dev_inst usb,
        ret = libusb_release_interface(usb.devhdl, USB_INTERFACE);
 
        if (ret < 0) {
-               sr_err("Failed to release interface: %i.",
+               sr_err("Failed to release interface: %s.",
                        libusb_error_name(ret));
                libusb_close(usb.devhdl);
                return SR_ERR;