diff --git a/[refs] b/[refs] index dfb7bdae03d7..5dc4fe410da2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e47654d016c68a02f654ac16951577804f7789c7 +refs/heads/master: 51a505d73bfed863135861fdc0496a09766b69d5 diff --git a/trunk/arch/powerpc/boot/gunzip_util.c b/trunk/arch/powerpc/boot/gunzip_util.c index e1e215e16983..ef2aed0f63ca 100644 --- a/trunk/arch/powerpc/boot/gunzip_util.c +++ b/trunk/arch/powerpc/boot/gunzip_util.c @@ -194,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;