* grub-core/loader/i386/xnu.c (grub_cmd_devprop_load): Fix error

message.
	* grub-core/video/radeon_fuloong2e.c
	(grub_video_radeon_fuloong2e_setup): Likewise.
	* grub-core/video/sis315pro.c (grub_video_sis315pro_setup): Likewise.
	* grub-core/video/video.c (grub_video_set_mode): Don't override
	standard out of memory message.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-03 12:47:07 +01:00
parent dc87d45a7a
commit c779226e6c
5 changed files with 14 additions and 5 deletions

View file

@ -503,8 +503,7 @@ grub_video_set_mode (const char *modestring,
next_mode = modevar;
if (! modevar)
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
"couldn't allocate space for local modevar copy");
return grub_errno;
if (grub_memcmp (next_mode, "keep", sizeof ("keep")) == 0
|| grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0