[PATCH] imacfb: Try to autodetect, but allow forcing model if autodetect fails.

If dmi_check_system fails to detect the variety of Intel Mac that it's
running on, the user should still be allowed to specify the model using
the "video=imacfb:..." kernel command-line option.

Signed-off-by: Jamey Sharp <[email protected]>
---
 drivers/video/imacfb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/video/imacfb.c b/drivers/video/imacfb.c
index 18ea4a5..065a0cd 100644
--- a/drivers/video/imacfb.c
+++ b/drivers/video/imacfb.c
@@ -357,15 +357,15 @@ static int __init imacfb_init(void)
 
 	if (!efi_enabled)
 		return -ENODEV;
-	if (!dmi_check_system(dmi_system_table))
-		return -ENODEV;
-	if (model == M_UNKNOWN)
-		return -ENODEV;
+	dmi_check_system(dmi_system_table);
 
 	if (fb_get_options("imacfb", &option))
 		return -ENODEV;
 
 	imacfb_setup(option);
+	if (model == M_UNKNOWN)
+		return -ENODEV;
+
 	ret = platform_driver_register(&imacfb_driver);
 
 	if (!ret) {
-- 
1.5.2.4


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/