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>

diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 7b0515297411fc092a3793222f95dd11c9adb6a8..7513d90fee6fcd33dfbd49dc35feb7461fce45e9 100644 (file)
--- 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,
                return;
 
        if (from & 1) {
-               *dest++ = BYTE1(flash_read16(src));
-                src++;
+               *dest++ = BYTE1(flash_read16(src-1));
+               src++;
                --len;
        }