2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>

	* loader/i386/linux.c (grub_linux_setup_video): Handle error
	appropriately.

diff --git a/ChangeLog b/ChangeLog
index 771ba8e04fcf0450d20e90a148744320fa6b1bb6..46c96bdb264d2c005ed7ff6e9c9bebbaf734e4d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * loader/i386/linux.c (grub_linux_setup_video): Handle error
+       appropriately.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 831d8b25a619cfbcd9578e3879f8c933e3d76db1..630aec6f40cf48c85120352ab1851ed2b3a62dbe 100644 (file)
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -394,12 +394,15 @@ grub_linux_setup_video (struct linux_kernel_params *params)
 {
   struct grub_video_mode_info mode_info;
   void *framebuffer;
-  int ret;
+  grub_err_t err;
 
-  ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
 
-  if (ret)
-    return 1;
+  if (err)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 1;
+    }
 
   params->lfb_width = mode_info.width;
   params->lfb_height = mode_info.height;