* grub-core/boot/i386/pc/boot.S: Fix %es:%bx pointing to nowhere on

	floppy probe.

diff --git a/ChangeLog b/ChangeLog
index 249ec6bc61e005fb8cb2ea8d779896f7aafdb244..80f5ef56879fd1b0ea570ffc7af78eb4a4c3e85b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-25  Mirko Parthey <mirko.parthey@informatik.tu-chemnitz.de>
+
+       * grub-core/boot/i386/pc/boot.S: Fix %es:%bx pointing to nowhere on
+       floppy probe.
+
 2010-12-25  Jeroen Dekkers <jeroen@dekkers.ch>
 
        * grub-core/disk/raid.c (insert_array): Don't add spurious members.

diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
index 32091856672b42b3de0b8c5293e1e816ef04aca0..635599a24c8ab3c58341032d99701894d1fe6bc6 100644 (file)
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -459,6 +459,8 @@ fd_probe_error_string:      .asciz "Floppy"
 1:
        /* perform read */
        movw    $GRUB_BOOT_MACHINE_BUFFER_SEG, %bx
+       movw    %bx, %es
+       xorw    %bx, %bx
        movw    $0x201, %ax
        movb    $0, %ch
        movb    $0, %dh