diff mbox

[U-Boot,4/6] lib: zlib: remove the limitation for cannot using 0 as start

Message ID 1332690817-31759-5-git-send-email-adrian.wenl@gmail.com
State Superseded
Delegated to: Marek Vasut
Headers show

Commit Message

Lei Wen March 25, 2012, 3:53 p.m. UTC 
From: Lei Wen <leiwen@marvell.com>

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>
---
 lib/zlib/deflate.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/lib/zlib/deflate.c b/lib/zlib/deflate.c
index 5c4022f..3f7de14 100644
--- a/lib/zlib/deflate.c
+++ b/lib/zlib/deflate.c
@@ -592,11 +592,8 @@  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);
 
     s->strm = strm; /* just in case */