fdt: Tidy up a few fdtdec problems

[karo-tx-uboot.git] / lib / gunzip.c

diff --git a/lib/gunzip.c b/lib/gunzip.c
index d2b7ad477916b4a03fbe6b6b439cc76456d6a9cb..8b16b2495fbec50956ff027c5e49803435034592 100644 (file)
--- a/lib/gunzip.c
+++ b/lib/gunzip.c
@@ -96,11 +96,6 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
 
        s.zalloc = zalloc;
        s.zfree = zfree;
-#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
-       s.outcb = (cb_func)WATCHDOG_RESET;
-#else
-       s.outcb = Z_NULL;
-#endif /* CONFIG_HW_WATCHDOG */
 
        r = inflateInit2(&s, -MAX_WBITS);
        if (r != Z_OK) {
@@ -111,12 +106,16 @@ int zunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp,
        s.avail_in = *lenp - offset;
        s.next_out = dst;
        s.avail_out = dstlen;
-       r = inflate(&s, Z_FINISH);
-       if ((r != Z_STREAM_END) && (stoponerr==1)) {
-               printf ("Error: inflate() returned %d\n", r);
-               inflateEnd(&s);
-               return (-1);
-       }
+       do {
+               r = inflate(&s, Z_FINISH);
+               if (r != Z_STREAM_END && r != Z_BUF_ERROR && stoponerr == 1) {
+                       printf("Error: inflate() returned %d\n", r);
+                       inflateEnd(&s);
+                       return -1;
+               }
+               s.avail_in = *lenp - offset - (int)(s.next_out - (unsigned char*)dst);
+               s.avail_out = dstlen;
+       } while (r == Z_BUF_ERROR);
        *lenp = s.next_out - (unsigned char *) dst;
        inflateEnd(&s);