Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / hardware / common / ezusb.c

diff --git a/hardware/common/ezusb.c b/hardware/common/ezusb.c
index c2849741c45d7854386887b232eb1a053f177a90..56ad5da53bdf2253ede3bb823aef710620a593ad 100644 (file)
--- a/hardware/common/ezusb.c
+++ b/hardware/common/ezusb.c
@@ -40,7 +40,7 @@ SR_PRIV int ezusb_reset(struct libusb_device_handle *hdl, int set_clear)
        err = libusb_control_transfer(hdl, LIBUSB_REQUEST_TYPE_VENDOR, 0xa0,
                                      0xe600, 0x0000, buf, 1, 100);
        if (err < 0)
-               sr_warn("Unable to send control request: %d", err);
+               sr_err("Unable to send control request: %d", err);
 
        return err;
 }
@@ -54,8 +54,8 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
 
        sr_info("Uploading firmware at %s", filename);
        if ((fw = g_fopen(filename, "rb")) == NULL) {
-               sr_warn("Unable to open firmware file %s for reading: %s",
-                       filename, strerror(errno));
+               sr_err("Unable to open firmware file %s for reading: %s",
+                      filename, strerror(errno));
                return SR_ERR;
        }
 
@@ -69,7 +69,7 @@ SR_PRIV int ezusb_install_firmware(libusb_device_handle *hdl,
                                              LIBUSB_ENDPOINT_OUT, 0xa0, offset,
                                              0x0000, buf, chunksize, 100);
                if (err < 0) {
-                       sr_warn("Unable to send firmware to device: %d", err);
+                       sr_err("Unable to send firmware to device: %d", err);
                        result = SR_ERR;
                        break;
                }
@@ -92,7 +92,7 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
                  libusb_get_bus_number(dev), libusb_get_device_address(dev));
 
        if ((err = libusb_open(dev, &hdl)) < 0) {
-               sr_warn("failed to open device: %d", err);
+               sr_err("failed to open device: %d", err);
                return SR_ERR;
        }
 
@@ -100,14 +100,14 @@ SR_PRIV int ezusb_upload_firmware(libusb_device *dev, int configuration,
 #if !defined(_WIN32) && !defined(__APPLE__)
        if (libusb_kernel_driver_active(hdl, 0)) {
                if ((err = libusb_detach_kernel_driver(hdl, 0)) < 0) {
-                       sr_warn("failed to detach kernel driver: %d", err);
+                       sr_err("failed to detach kernel driver: %d", err);
                        return SR_ERR;
                }
        }
 #endif
 
        if ((err = libusb_set_configuration(hdl, configuration)) < 0) {
-               sr_warn("Unable to set configuration: %d", err);
+               sr_err("Unable to set configuration: %d", err);
                return SR_ERR;
        }