mtd: OneNAND: Fix page offset handling at 2KiB pagesize

When use the 2KiB pagesize, it should be set the correct page offset.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/onenand/samsung.c
index 0de7a05e6de065ecfd90cd465939374c11b12090..a4c74a9ba430de20716eddbbd23b24f8fef9a8b5 100644 (file)
--- a/drivers/mtd/onenand/samsung.c
+++ b/drivers/mtd/onenand/samsung.c
@@ -651,7 +651,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
        void __iomem *p;
        void *buf = (void *) buffer;
        dma_addr_t dma_src, dma_dst;
-       int err, page_dma = 0;
+       int err, ofs, page_dma = 0;
        struct device *dev = &onenand->pdev->dev;
 
        p = this->base + area;
@@ -677,10 +677,13 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
                if (!page)
                        goto normal;
 
+               /* Page offset */
+               ofs = ((size_t) buf & ~PAGE_MASK);
                page_dma = 1;
+
                /* DMA routine */
                dma_src = onenand->phys_base + (p - this->base);
-               dma_dst = dma_map_page(dev, page, 0, count, DMA_FROM_DEVICE);
+               dma_dst = dma_map_page(dev, page, ofs, count, DMA_FROM_DEVICE);
        } else {
                /* DMA routine */
                dma_src = onenand->phys_base + (p - this->base);