diff options
| 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 |
| commit | 740b9e25b410c164e661d0334a9ea4168406726b (patch) | |
| tree | 0c396aab2d3287a0bb38b6d9bf3921d12d273740 /src/jtag/drivers/jlink.c | |
| parent | 5cd931ed1ccc75bdbaab821686ceff04c3cb002b (diff) | |
| download | openocd+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/drivers/jlink.c')
| -rw-r--r-- | src/jtag/drivers/jlink.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index ff389e9e..e7e3ced9 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -321,7 +321,11 @@ static int jlink_init(void) jlink_reset(0, 0); jtag_sleep(3000); jlink_tap_init(); - jlink_speed(jtag_get_speed()); + int jtag_speed_var; + int retval = jtag_get_speed(&jtag_speed_var); + if (retval != ERROR_OK) + return retval; + jlink_speed(jtag_speed_var); /* v5/6 jlink seems to have an issue if the first tap move * is not divisible by 8, so we send a TLR on first power up */ |