Merge branch 'mpc86xx'

[u-boot] / lib_generic / bzlib.c

diff --git a/lib_generic/bzlib.c b/lib_generic/bzlib.c
index 8a64b799e4a54c2d8faa1cd48bf8400a62ffb045..87e6a6eed6e8a2691ce9220705a18b76f5dca4fb 100644 (file)
--- a/lib_generic/bzlib.c
+++ b/lib_generic/bzlib.c
@@ -1,4 +1,6 @@
 #include <config.h>
+#include <common.h>
+#include <watchdog.h>
 #ifdef CONFIG_BZIP2
 
 /*
@@ -841,6 +843,9 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
    if (s->strm != strm) return BZ_PARAM_ERROR;
 
    while (True) {
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+       WATCHDOG_RESET();
+#endif
       if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
       if (s->state == BZ_X_OUTPUT) {
         if (s->smallDecompress)