X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fpresto.c;h=ca6e9d50a169d850406f4cd480ea7bf3620596ee;hp=ababf093d9466480acefe0a3551080c697413001;hb=740b9e25b410c164e661d0334a9ea4168406726b;hpb=0811f6b192674788a00e02fbbfe29e0a2a138ea2

diff --git a/src/jtag/drivers/presto.c b/src/jtag/drivers/presto.c
index ababf093d9..ca6e9d50a1 100644
--- 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,