aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Ringle <jon@ringle.org>2010-01-13 09:36:10 -0500
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-02-25 06:28:56 -0500
commit53f2b1c86a1fa1414be93571062ac4c263fa9fbc (patch)
tree62bfe4d6e07f211f6aa004dc0643f8c3fd850800
parent9c14b153e6af1301f022d34f1f63888f333e3ef5 (diff)
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>
-rw-r--r--drivers/mtd/maps/ixp4xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7b051529741..7513d90fee6 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -107,8 +107,8 @@ static void ixp4xx_copy_from(struct map_info *map, void *to,
107 return; 107 return;
108 108
109 if (from & 1) { 109 if (from & 1) {
110 *dest++ = BYTE1(flash_read16(src)); 110 *dest++ = BYTE1(flash_read16(src-1));
111 src++; 111 src++;
112 --len; 112 --len;
113 } 113 }
114 114