jtag: getting the JTAG speed can fail

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

diff --git a/src/jtag/drivers/usb_blaster.c b/src/jtag/drivers/usb_blaster.c
index 59c5715bdf401ee281ff01deaba0bfaaa9a768d0..c9b88f86534d43700033e8f6e6b5208a02142aee 100644 (file)
--- a/src/jtag/drivers/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster.c
@@ -442,7 +442,11 @@ static int usb_blaster_init(void)
 
        bitbang_interface = &usb_blaster_bitbang;
 
-       usb_blaster_speed(jtag_get_speed());
+       int jtag_speed_var;
+       int retval = jtag_get_speed(&jtag_speed_var);
+       if (retval != ERROR_OK)
+               return retval;
+       usb_blaster_speed(jtag_speed_var);
 
 #if 0
 #if BUILD_USB_BLASTER_FTD2XX == 1
@@ -492,7 +496,7 @@ COMMAND_HANDLER(usb_blaster_handle_vid_pid_command)
 {
        if (CMD_ARGC > 2)
        {
-               LOG_WARNING("ignoring extra IDs in ft2232_vid_pid "
+               LOG_WARNING("ignoring extra IDs in usb_blaster_vid_pid "
                                        "(maximum is 1 pair)");
                CMD_ARGC = 2;
        }