From: Greg Lopp <lopp@pobox.com>
Date: Fri, 13 Apr 2007 06:02:24 +0000 (+0200)
Subject: [PATCH] Fix use of "void *" for block dev read/write buffer pointers
X-Git-Tag: v1.3.0-rc1~113^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0b94504d22e70f537c17a0d38c87edb6e370977d;p=u-boot

[PATCH] Fix use of "void *" for block dev read/write buffer pointers

Signed-of-by: Greg Lopp <lopp@pobox.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
---

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index b4119f3072..28797a920c 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -1344,7 +1344,7 @@ ulong ide_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
 
 		++n;
 		++blknr;
-		buffer += ATA_SECTORWORDS;
+		buffer += ATA_BLOCKSIZE;
 	}
 IDE_READ_E:
 	ide_led (DEVICE_LED(device), 0);	/* LED off	*/
@@ -1428,7 +1428,7 @@ ulong ide_write (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
 		c = ide_inb (device, ATA_STATUS);	/* clear IRQ */
 		++n;
 		++blknr;
-		buffer += ATA_SECTORWORDS;
+		buffer += ATA_BLOCKSIZE;
 	}
 WR_OUT:
 	ide_led (DEVICE_LED(device), 0);	/* LED off	*/
@@ -2052,7 +2052,7 @@ ulong atapi_read (int device, lbaint_t blknr, ulong blkcnt, void *buffer)
 		n+=cnt;
 		blkcnt-=cnt;
 		blknr+=cnt;
-		buffer+=cnt*(ATAPI_READ_BLOCK_SIZE/4); /* ulong blocksize in ulong */
+		buffer+=(cnt*ATAPI_READ_BLOCK_SIZE);
 	} while (blkcnt > 0);
 	return (n);
 }