From: John Devereux <john@devereux.me.uk>
Date: Tue, 14 Dec 2010 12:17:01 +0000 (+0000)
Subject: Fix for compilation failure amt_jtagaccel.c
X-Git-Tag: v0.5.0-rc1~275
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2eebdcf93e06ec1c91efcf75ad1aa29f9bef9e5f;p=openocd

Fix for compilation failure amt_jtagaccel.c

Hi,

I think there are errors in amt_jtagaccel.c

I attach a small patch that I needed to make it compile.
---

diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c
index 552d04d2..ee44a2b6 100644
--- a/src/jtag/drivers/amt_jtagaccel.c
+++ b/src/jtag/drivers/amt_jtagaccel.c
@@ -191,6 +191,7 @@ static void amt_jtagaccel_state_move(void)
 
 	aw_scan_tms_5 = 0x40 | (tms_scan[0] & 0x1f);
 	AMT_AW(aw_scan_tms_5);
+        int jtag_speed=0;
 	int retval = jtag_get_speed(&jtag_speed);
 	assert(retval == ERROR_OK);
 	if (jtag_speed > 3 || rtck_enabled)
@@ -507,6 +508,8 @@ static int amt_jtagaccel_init(void)
 
 	int jtag_speed_var;
 	int retval = jtag_get_speed(&jtag_speed_var);
+	if (retval != ERROR_OK)
+          return retval;
 	amt_jtagaccel_speed(jtag_speed_var);
 
 	enum reset_types jtag_reset_config = jtag_get_reset_config();