---

yaml --- r: 67407 b: refs/heads/master c: 51a505d h: refs/heads/master i: 67405: 7f7f2eb 67403: d6811af 67399: 205c953 67391: c983b06 v: v3
git-mirror · Oct 3, 2007 · 20d1e27 · 20d1e27
1 parent bd97053
commit 20d1e27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;