From a2cb213a05fa7004dd8f90658a6d93611e480879 Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kmpark@infradead.org>
Date: Wed, 21 May 2008 14:34:56 +0300
Subject: [PATCH] --- yaml --- r: 106059 b: refs/heads/master c:
 a0fd1efd488092951f310fdb777b8a540cf84dcb h: refs/heads/master i:   106057:
 7f69c0b321efa9cf8afba5c211e2f8429cfce4b9   106055:
 13866901d187ffb7eb2f6f4a36e51371b5021f46 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/ubi/upd.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c6b77288fde2..13c62a409c7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: beeea636030622f6de67d15c61f5b311a03d188c
+refs/heads/master: a0fd1efd488092951f310fdb777b8a540cf84dcb
diff --git a/trunk/drivers/mtd/ubi/upd.c b/trunk/drivers/mtd/ubi/upd.c
index ddaa1a56cc69..6fa1ab3f2a70 100644
--- a/trunk/drivers/mtd/ubi/upd.c
+++ b/trunk/drivers/mtd/ubi/upd.c
@@ -237,10 +237,10 @@ static int write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum,
 	int err;
 
 	if (vol->vol_type == UBI_DYNAMIC_VOLUME) {
-		len = ALIGN(len, ubi->min_io_size);
-		memset(buf + len, 0xFF, len - len);
+		int l = ALIGN(len, ubi->min_io_size);
 
-		len = ubi_calc_data_len(ubi, buf, len);
+		memset(buf + len, 0xFF, l - len);
+		len = ubi_calc_data_len(ubi, buf, l);
 		if (len == 0) {
 			dbg_msg("all %d bytes contain 0xFF - skip", len);
 			return 0;