From b63f2d7b2d37c163702cabf5f0d523d5052baa02 Mon Sep 17 00:00:00 2001
From: Brian Maly <bmaly@redhat.com>
Date: Tue, 31 Mar 2009 15:25:50 -0700
Subject: [PATCH] --- yaml --- r: 139299 b: refs/heads/master c:
 e14a685dfabf3ceeb366f1db1a22471b8f98a08b h: refs/heads/master i:   139297:
 0744d69046cd927a4066199f3668aa1baa9345bb   139295:
 ee70fe167c2b3bd5164195bd84d614c562e612de v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/efifb.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b0eeb53c3d1e..6ae40ffc89a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04645fc337eef283887d3b1204017f1860ed2ff7
+refs/heads/master: e14a685dfabf3ceeb366f1db1a22471b8f98a08b
diff --git a/trunk/drivers/video/efifb.c b/trunk/drivers/video/efifb.c
index daf9b81878a4..0c5b9a9fd56f 100644
--- a/trunk/drivers/video/efifb.c
+++ b/trunk/drivers/video/efifb.c
@@ -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;
 }
@@ -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;