summaryrefslogtreecommitdiff
path: root/src/jtag/zy1000
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2010-12-06 09:21:23 +0100
committerØyvind Harboe <oyvind.harboe@zylin.com>2010-12-08 08:43:52 +0100
commit740b9e25b410c164e661d0334a9ea4168406726b (patch)
tree0c396aab2d3287a0bb38b6d9bf3921d12d273740 /src/jtag/zy1000
parent5cd931ed1ccc75bdbaab821686ceff04c3cb002b (diff)
downloadopenocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.gz
openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.bz2
openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.tar.xz
openocd_libswd-740b9e25b410c164e661d0334a9ea4168406726b.zip
jtag: getting the JTAG speed can fail
If the JTAG speed has not been set, then it has no defined value, add code to propagate the error. No change to actual behavior as no new failure paths have been introduced. This is a no-op patch to make subsequent patches smaller. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src/jtag/zy1000')
-rw-r--r--src/jtag/zy1000/zy1000.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index c8bee2f5..69fa4dc8 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -1620,7 +1620,11 @@ int zy1000_init(void)
/* deassert resets. Important to avoid infinite loop waiting for SRST to deassert */
zy1000_reset(0, 0);
- zy1000_speed(jtag_get_speed());
+ int jtag_speed_var;
+ int retval = jtag_get_speed(&jtag_speed_var);
+ if (retval != ERROR_OK)
+ return retval;
+ zy1000_speed(jtag_speed_var);
#if BUILD_ECOSBOARD