2010-02-07 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/linux.c (grub_linux_setup_video): Handle error appropriately.
This commit is contained in:
parent
6b2ad14b7a
commit
74e31b5ca2
2 changed files with 12 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
if (err)
|
||||
{
|
||||
grub_errno = GRUB_ERR_NONE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
params->lfb_width = mode_info.width;
|
||||
params->lfb_height = mode_info.height;
|
||||
|
|
Loading…
Reference in a new issue