From: Øyvind Harboe Date: Tue, 4 May 2010 10:28:05 +0000 (+0200) Subject: zy1000: fix keep_alive() bug X-Git-Tag: v0.5.0-rc1~718 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=812e21ac396247767da0144748b5f52ad11b3e17;p=openocd zy1000: fix keep_alive() bug introduced in latest commit. Should have held off merging that commit. Sigh.... Signed-off-by: Øyvind Harboe --- diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index 092e3cd2..2fac1767 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -205,6 +205,8 @@ void zy1000_reset(int trst, int srst) total = timeval_ms() - start; + keep_alive(); + if (total > 5000) { LOG_ERROR("SRST took too long to deassert: %dms", (int)total);