[syslinux:master] core, diskio: move dprintfs to the intended location

syslinux-bot for H. Peter Anvin hpa at zytor.com
Thu Jul 1 07:24:45 PDT 2010


Commit-ID:  04639c3ea4179a98d555c13ce6b73d49e96bf4e5
Gitweb:     http://syslinux.zytor.com/commit/04639c3ea4179a98d555c13ce6b73d49e96bf4e5
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Thu, 1 Jul 2010 07:19:23 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Thu, 1 Jul 2010 07:19:23 -0700

core, diskio: move dprintfs to the intended location

Move the dprintfs to the location that they were intended to use.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 core/fs/diskio.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/fs/diskio.c b/core/fs/diskio.c
index b186af6..1180c44 100644
--- a/core/fs/diskio.c
+++ b/core/fs/diskio.c
@@ -76,11 +76,12 @@ static int chs_rdwr_sectors(struct disk *disk, void *buf,
 	    __intcall(0x13, &ireg, &oreg);
 	    if (!(oreg.eflags.l & EFLAGS_CF))
 		break;
-	    if (retry--)
-		continue;
 
 	    dprintf("CHS: error AX = %04x\n", oreg.eax.w[0]);
 
+	    if (retry--)
+		continue;
+
 	    /* For any starting value, this will always end with ..., 1, 0 */
 	    chunk >>= 1;
             if (chunk) {
@@ -179,11 +180,12 @@ static int edd_rdwr_sectors(struct disk *disk, void *buf,
 	    __intcall(0x13, &ireg, &oreg);
 	    if (!(oreg.eflags.l & EFLAGS_CF))
 		break;
-	    if (retry--)
-		continue;
 
 	    dprintf("EDD: error AX = %04x\n", oreg.eax.w[0]);
 
+	    if (retry--)
+		continue;
+
 	    /* For any starting value, this will always end with ..., 1, 0 */
 	    chunk >>= 1;
 	    if (chunk) {



More information about the Syslinux-commits mailing list