1 files changed, 3 insertions, 5 deletions

diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index df8ab07e9ff4..ef2aed0f63ca 100644
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -78,6 +78,7 @@ void gunzip_start(struct gunzip_state *state, void *src, int srclen)
                         fatal("inflateInit2 returned %d\n\r", r);
         }
 
+        state->s.total_in = hdrlen;
         state->s.next_in = src + hdrlen;
         state->s.avail_in = srclen - hdrlen;
 }
@@ -193,13 +194,10 @@ int gunzip_finish(struct gunzip_state *state, void *dst, int dstlen)
 {
         int len;
 
+        len = gunzip_partial(state, dst, dstlen);
+
         if (state->s.workspace) {
-                len = gunzip_partial(state, dst, dstlen);
                 zlib_inflateEnd(&state->s);
-        } else {
-                /* uncompressed image */
-                len = min(state->s.avail_in, (unsigned)dstlen);
-                memcpy(dst, state->s.next_in, len);
         }
 
         return len;