Browse Source

mtd: OneNAND: Fix 2KiB pagesize handling at Samsung SoCs

Wrong assumption bufferram can be switched between BufferRAM0 and BufferRAM1

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Kyungmin Park 15 years ago
parent
commit
9aba97ad00
1 changed files with 2 additions and 3 deletions
  1. 2 3
      drivers/mtd/onenand/samsung.c

+ 2 - 3
drivers/mtd/onenand/samsung.c

@@ -571,13 +571,12 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
 		unsigned char *buffer, int offset, size_t count)
 		unsigned char *buffer, int offset, size_t count)
 {
 {
 	struct onenand_chip *this = mtd->priv;
 	struct onenand_chip *this = mtd->priv;
-	void __iomem *bufferram;
 	void __iomem *p;
 	void __iomem *p;
 	void *buf = (void *) buffer;
 	void *buf = (void *) buffer;
 	dma_addr_t dma_src, dma_dst;
 	dma_addr_t dma_src, dma_dst;
 	int err;
 	int err;
 
 
-	p = bufferram = this->base + area;
+	p = this->base + area;
 	if (ONENAND_CURRENT_BUFFERRAM(this)) {
 	if (ONENAND_CURRENT_BUFFERRAM(this)) {
 		if (area == ONENAND_DATARAM)
 		if (area == ONENAND_DATARAM)
 			p += this->writesize;
 			p += this->writesize;
@@ -621,7 +620,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area,
 normal:
 normal:
 	if (count != mtd->writesize) {
 	if (count != mtd->writesize) {
 		/* Copy the bufferram to memory to prevent unaligned access */
 		/* Copy the bufferram to memory to prevent unaligned access */
-		memcpy(this->page_buf, bufferram, mtd->writesize);
+		memcpy(this->page_buf, p, mtd->writesize);
 		p = this->page_buf + offset;
 		p = this->page_buf + offset;
 	}
 	}