Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 139299
b: refs/heads/master
c: e14a685
h: refs/heads/master
i:
  139297: 0744d69
  139295: ee70fe1
v: v3
  • Loading branch information
Brian Maly authored and Linus Torvalds committed Apr 1, 2009
1 parent 2be775e commit b63f2d7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 04645fc337eef283887d3b1204017f1860ed2ff7
refs/heads/master: e14a685dfabf3ceeb366f1db1a22471b8f98a08b
5 changes: 4 additions & 1 deletion trunk/drivers/video/efifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ static int set_system(const struct dmi_system_id *id)
screen_info.lfb_width = info->width;
if (screen_info.lfb_height == 0)
screen_info.lfb_height = info->height;
if (screen_info.orig_video_isVGA == 0)
screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;

return 0;
}
Expand Down Expand Up @@ -374,9 +376,10 @@ static int __init efifb_init(void)
int ret;
char *option = NULL;

dmi_check_system(dmi_system_table);

if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
return -ENODEV;
dmi_check_system(dmi_system_table);

if (fb_get_options("efifb", &option))
return -ENODEV;
Expand Down

0 comments on commit b63f2d7

Please sign in to comment.