Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / crypto / deflate.c

diff --git a/crypto/deflate.c b/crypto/deflate.c
index 463dc859aa059d6e5f593e6db437e93025974c18..cbc7a33a9600c2b1cb9e9bdc161f3586229b85d1 100644 (file)
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -48,12 +48,11 @@ static int deflate_comp_init(struct deflate_ctx *ctx)
        int ret = 0;
        struct z_stream_s *stream = &ctx->comp_stream;
 
-       stream->workspace = vmalloc(zlib_deflate_workspacesize());
+       stream->workspace = vzalloc(zlib_deflate_workspacesize());
        if (!stream->workspace) {
                ret = -ENOMEM;
                goto out;
        }
-       memset(stream->workspace, 0, zlib_deflate_workspacesize());
        ret = zlib_deflateInit2(stream, DEFLATE_DEF_LEVEL, Z_DEFLATED,
                                -DEFLATE_DEF_WINBITS, DEFLATE_DEF_MEMLEVEL,
                                Z_DEFAULT_STRATEGY);