commit 53f2b1c86a1fa1414be93571062ac4c263fa9fbc
author Jon Ringle <jon@ringle.org> Wed Jan 13 09:36:10 2010 -0500
committer David Woodhouse <David.Woodhouse@intel.com> Thu Feb 25 11:28:56 2010 +0000
tree 62bfe4d6e07f211f6aa004dc0643f8c3fd850800
parent 9c14b153e6af1301f022d34f1f63888f333e3ef5

mtd: ixp4xx: fix reading from half-word boundary

Fix handling of reads that don't start on a half-word boundary.

Signed-off-by: Jon Ringle <jon@ringle.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

drivers/mtd/maps/ixp4xx.c

diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7b05152..7513d90 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -107,8 +107,8 @@
 		return;
 
 	if (from & 1) {
-		*dest++ = BYTE1(flash_read16(src));
-                src++;
+		*dest++ = BYTE1(flash_read16(src-1));
+		src++;
 		--len;
 	}