summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-12 10:26:48 -0700
committerTom Rini <trini@ti.com>2012-09-12 10:26:48 -0700
commitb89598a1480e015844bd0558c7bdd49ce551a0c3 (patch)
treef80f7bc5a797f000bb67162d50c894930f49d6eb
parenta9ae14fce312c65cb3d26710afdd9b64a868dafc (diff)
parent8044c1387f7f8acb2a82f64f1b087848395deb15 (diff)
downloadblackbird-obmc-uboot-b89598a1480e015844bd0558c7bdd49ce551a0c3.tar.gz
blackbird-obmc-uboot-b89598a1480e015844bd0558c7bdd49ce551a0c3.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-ubi
-rw-r--r--fs/ubifs/ubifs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c
index c68802bc8d..44be3f53e0 100644
--- a/fs/ubifs/ubifs.c
+++ b/fs/ubifs/ubifs.c
@@ -37,8 +37,8 @@ DECLARE_GLOBAL_DATA_PTR;
static int gzip_decompress(const unsigned char *in, size_t in_len,
unsigned char *out, size_t *out_len)
{
- unsigned long len = in_len;
- return zunzip(out, *out_len, (unsigned char *)in, &len, 0, 0);
+ return zunzip(out, *out_len, (unsigned char *)in,
+ (unsigned long *)out_len, 0, 0);
}
/* Fake description object for the "none" compressor */
OpenPOWER on IntegriCloud