jtag/drivers: remove useless checks causing build failure with clang 3.5.0

[openocd.git] / src / jtag / drivers / usb_blaster / ublast2_access_libusb.c

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index 437150d752d3b6814ec399329aad6fd5c42435b1..ac863918cb724e3f821ef8ea52b13629b4375216 100644 (file)
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -74,9 +74,6 @@ static int ublast2_write_firmware_section(struct jtag_libusb_device_handle *libu
        LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
                size);
 
        LOG_DEBUG("section %02i at addr 0x%04x (size 0x%04x)", section_index, addr,
                size);
 

-       if (data == NULL)
-               return ERROR_FAIL;
-

        /* Copy section contents to local buffer */
        int ret = image_read_section(firmware_image, section_index, 0, size, data,
                        &size_read);
        /* Copy section contents to local buffer */
        int ret = image_read_section(firmware_image, section_index, 0, size, data,
                        &size_read);


@@ -186,7 +183,7 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
        bool renumeration = false;
        int ret;
 
        bool renumeration = false;
        int ret;
 

-       if (jtag_libusb_open(vids, pids, &temp) == ERROR_OK) {
+       if (jtag_libusb_open(vids, pids, NULL, &temp) == ERROR_OK) {

                LOG_INFO("Altera USB-Blaster II (uninitialized) found");
                LOG_INFO("Loading firmware...");
                ret = load_usb_blaster_firmware(temp, low);
                LOG_INFO("Altera USB-Blaster II (uninitialized) found");
                LOG_INFO("Loading firmware...");
                ret = load_usb_blaster_firmware(temp, low);


@@ -200,13 +197,13 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
        const uint16_t pids_renum[] = { low->ublast_pid, 0 };
 
        if (renumeration == false) {
        const uint16_t pids_renum[] = { low->ublast_pid, 0 };
 
        if (renumeration == false) {

-               if (jtag_libusb_open(vids_renum, pids_renum, &low->libusb_dev) != ERROR_OK) {
+               if (jtag_libusb_open(vids_renum, pids_renum, NULL, &low->libusb_dev) != ERROR_OK) {

                        LOG_ERROR("Altera USB-Blaster II not found");
                        return ERROR_FAIL;
                }
        } else {
                int retry = 10;
                        LOG_ERROR("Altera USB-Blaster II not found");
                        return ERROR_FAIL;
                }
        } else {
                int retry = 10;

-               while (jtag_libusb_open(vids_renum, pids_renum, &low->libusb_dev) != ERROR_OK && retry--) {
+               while (jtag_libusb_open(vids_renum, pids_renum, NULL, &low->libusb_dev) != ERROR_OK && retry--) {

                        usleep(1000000);
                        LOG_INFO("Waiting for renumerate...");
                }
                        usleep(1000000);
                        LOG_INFO("Waiting for renumerate...");
                }