samsung-laptop: make the dmi check less strict (part 2)
authorBen Hutchings <ben@decadent.org.uk>
Sun, 9 Sep 2012 17:49:14 +0000 (18:49 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 30 Oct 2012 23:26:27 +0000 (23:26 +0000)
commit 3be324a94df0c3f032178d04549dbfbf6cccb09a upstream.

These are the hunks that I dropped when backporting for 3.2.24,
which are applicable now that we also have commit f34cd9ca
('samsung-laptop: don't handle backlight if handled by acpi/video').

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/platform/x86/samsung-laptop.c

index c1aa1b7..21bc1a7 100644 (file)
@@ -608,10 +608,8 @@ static int __init samsung_init(void)
 
 #ifdef CONFIG_ACPI
        /* Don't handle backlight here if the acpi video already handle it */
 
 #ifdef CONFIG_ACPI
        /* Don't handle backlight here if the acpi video already handle it */
-       if (acpi_video_backlight_support()) {
-               pr_info("Backlight controlled by ACPI video driver\n");
+       if (acpi_video_backlight_support())
                handle_backlight = false;
                handle_backlight = false;
-       }
 #endif
 
        if (!force && !dmi_check_system(samsung_dmi_table))
 #endif
 
        if (!force && !dmi_check_system(samsung_dmi_table))
@@ -695,6 +693,12 @@ static int __init samsung_init(void)
        if (handle_backlight)
                check_for_stepping_quirk();
 
        if (handle_backlight)
                check_for_stepping_quirk();
 
+#ifdef CONFIG_ACPI
+       /* Only log that if we are really on a sabi platform */
+       if (acpi_video_backlight_support())
+               pr_info("Backlight controlled by ACPI video driver\n");
+#endif
+
        /* knock up a platform device to hang stuff off of */
        sdev = platform_device_register_simple("samsung", -1, NULL, 0);
        if (IS_ERR(sdev))
        /* knock up a platform device to hang stuff off of */
        sdev = platform_device_register_simple("samsung", -1, NULL, 0);
        if (IS_ERR(sdev))