From 20d1e27a9dbeced80d42308925e66ea9f0b5f390 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Sat, 22 Sep 2007 09:03:52 +1000
Subject: [PATCH] --- yaml --- r: 67407 b: refs/heads/master c:
 51a505d73bfed863135861fdc0496a09766b69d5 h: refs/heads/master i:   67405:
 7f7f2eb8f1ea6e4b98682b909ba1ee25a431b572   67403:
 d6811af57c65042cad56a43b096796e8253ffecd   67399:
 205c953ac958dc136358b3a26a388ba1360ea06a   67391:
 c983b06a2ad9c394f10f7ef402f41e6b3faa2666 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/powerpc/boot/gunzip_util.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

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;