From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Date: Wed, 16 Apr 2008 17:47:13 +0000 (+0300)
Subject: ubinize: correctly calculate VID offset when min I/O unit is 1
X-Git-Tag: v1.2.0~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bcc87aa2d908389534394caa8659fd613817584f;p=mtd-utils.git

ubinize: correctly calculate VID offset when min I/O unit is 1

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---

diff --git a/ubi-utils/new-utils/src/libubigen.c b/ubi-utils/new-utils/src/libubigen.c
index 8d71fde..34e2c0b 100644
--- a/ubi-utils/new-utils/src/libubigen.c
+++ b/ubi-utils/new-utils/src/libubigen.c
@@ -52,8 +52,11 @@ void ubigen_info_init(struct ubigen_info *ui, int peb_size, int min_io_size,
 		      int subpage_size, int vid_hdr_offs, int ubi_ver,
 		      long long ec)
 {
-	if (!vid_hdr_offs)
-		vid_hdr_offs = subpage_size;
+	if (!vid_hdr_offs) {
+		vid_hdr_offs = UBI_EC_HDR_SIZE + subpage_size - 1;
+		vid_hdr_offs /= subpage_size;
+		vid_hdr_offs *= subpage_size;
+	}
 
 	ui->peb_size = peb_size;
 	ui->min_io_size = min_io_size;