From: Michal Simek <michal.simek@xilinx.com>
Date: Wed, 23 Jan 2013 12:06:34 +0000 (+0100)
Subject: Revert "ubi: Only read the actual size of the VID header"
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37c26c98bace183d91cc29d064f7ec973794938f;p=thirdparty%2Fu-boot.git

Revert "ubi: Only read the actual size of the VID header"

This reverts commit befc4f3ee911ffb5c9160bf9861887ce2fa1c411.

We are not using UBI. Sync with mainline.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 23660e3dd1e..8423894000b 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -916,7 +916,7 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
 
 	p = (char *)vid_hdr - ubi->vid_hdr_shift;
 	err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset,
-			  UBI_VID_HDR_SIZE);
+			  ubi->vid_hdr_alsize);
 	if (err) {
 		if (err != UBI_IO_BITFLIPS && err != -EBADMSG)
 			return err;