diff --git a/ChangeLog b/ChangeLog
index d8ad1d634..742a8cec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-20  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/loader/i386/linux.c (grub_linux_setup_video): Add
+	GRUB_VIDEO_DRIVER_RADEON_FULOONG2E to switch case statement.
+
+2011-08-20  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/io/gzio.c (grub_gzio_open): Always return original io if
+	file type was not recognized correctly (not gzip or corrupted).
+
 2011-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/mips/loongson/init.c (grub_reboot): Reboot Fuloong.
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 5d3e5332e..7380221aa 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -1179,12 +1179,9 @@ grub_gzio_open (grub_file_t io)
       grub_free (gzio);
       grub_free (file);
       grub_file_seek (io, 0);
+      grub_errno = GRUB_ERR_NONE;
 
-      if (grub_errno == GRUB_ERR_BAD_FILE_TYPE)
-	{
-	  grub_errno = GRUB_ERR_NONE;
-	  return io;
-	}
+      return io;
     }
 
   return file;
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 5356d7ace..fded7bb0a 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -374,6 +374,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
 	case GRUB_VIDEO_DRIVER_VGA:
 	case GRUB_VIDEO_DRIVER_CIRRUS:
 	case GRUB_VIDEO_DRIVER_BOCHS:
+	case GRUB_VIDEO_DRIVER_RADEON_FULOONG2E:
 	  /* Make gcc happy. */
 	case GRUB_VIDEO_DRIVER_SDL:
 	case GRUB_VIDEO_DRIVER_NONE: