From: Lei Wen <adrian.wenl@gmail.com>
Date: Fri, 28 Sep 2012 04:26:45 +0000 (+0000)
Subject: lib: zlib: remove the limitation for cannot using 0 as start
X-Git-Tag: v2012.10-rc2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=869c2abbaf98e91e7c9ef71806f6c8eef91206ae;p=oweals%2Fu-boot.git

lib: zlib: remove the limitation for cannot using 0 as start

We often need the requirement that compressing those memory range start
from 0, but the default deflate code in zlib prevent us to do this.
Considering the special case of uboot, that it could access all memory
range, it is reasonable to be able to also take the address space from 0
into compression.

Signed-off-by: Lei Wen <leiwen@marvell.com>
---

diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c
index 5c4022f3d4..9a20b70344 100644
--- a/lib/zlib/deflate.c
+++ b/lib/zlib/deflate.c
@@ -592,9 +592,7 @@ int ZEXPORT deflate (strm, flush)
     }
     s = strm->state;
 
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-        (s->status == FINISH_STATE && flush != Z_FINISH)) {
+    if (s->status == FINISH_STATE && flush != Z_FINISH) {
         ERR_RETURN(strm, Z_STREAM_ERROR);
     }
     if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);