jtag: getting the JTAG speed can fail

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

diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index ababf093d9466480acefe0a3551080c697413001..ca6e9d50a169d850406f4cd480ea7bf3620596ee 100644 (file)
--- a/src/jtag/drivers/presto.c
+++ b/src/jtag/drivers/presto.c
@@ -19,7 +19,8 @@
  ***************************************************************************/
 
 /**
- * @file Holds driver for PRESTO programmer from ASIX.
+ * @file
+ * Holds driver for PRESTO programmer from ASIX.
  * http://tools.asix.net/prg_presto.htm
  */
 #ifdef HAVE_CONFIG_H
@@ -679,7 +680,7 @@ static struct bitq_interface presto_bitq = {
 
 /* -------------------------------------------------------------------------- */
 
-static int presto_jtag_khz(int khz, int *jtag_speed)
+static int presto_adapter_khz(int khz, int *jtag_speed)
 {
        if (khz < 0)
        {
@@ -769,7 +770,11 @@ static int presto_jtag_init(void)
        LOG_INFO("PRESTO open, serial number '%s'", presto->serial);
 
        /* use JTAG speed setting from configuration file */
-       presto_jtag_speed(jtag_get_speed());
+       int jtag_speed_var;
+       int retval = jtag_get_speed(&jtag_speed_var);
+       if (retval != ERROR_OK)
+               return retval;
+       presto_jtag_speed(jtag_speed_var);
 
        bitq_interface = &presto_bitq;
        return ERROR_OK;
@@ -796,7 +801,7 @@ struct jtag_interface presto_interface = {
 
        .execute_queue = bitq_execute_queue,
        .speed = presto_jtag_speed,
-       .khz = presto_jtag_khz,
+       .khz = presto_adapter_khz,
        .speed_div = presto_jtag_speed_div,
        .init = presto_jtag_init,
        .quit = presto_jtag_quit,