vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
* loader/i386/linux.c (grub_linux_setup_video): Handle error
	appropriately.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-02-07 01:41:23 +01:00
parent 6b2ad14b7a
commit 74e31b5ca2
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
* fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting * fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting

9
loader/i386/linux.c
View file

@ -394,12 +394,15 @@ grub_linux_setup_video (struct linux_kernel_params *params)
{ {
struct grub_video_mode_info mode_info; struct grub_video_mode_info mode_info;
void *framebuffer; 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) if (err)
{
grub_errno = GRUB_ERR_NONE;
return 1; return 1;
}
params->lfb_width = mode_info.width; params->lfb_width = mode_info.width;
params->lfb_height = mode_info.height; params->lfb_height = mode_info.height;