diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2012-09-09 18:49:14 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-10-30 23:26:27 +0000 |
| commit | 6f182a333e4cbaac645e73b3dc601bd456e2bad0 (patch) | |
| tree | 2906e4c686d80c663247fcc955a9157e0b01c702 | |
| parent | 7575321ed9310c37a94e87c464eefe0cc808290a (diff) | |
| download | lwn-6f182a333e4cbaac645e73b3dc601bd456e2bad0.tar.gz lwn-6f182a333e4cbaac645e73b3dc601bd456e2bad0.zip | |
samsung-laptop: make the dmi check less strict (part 2)
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>
| -rw-r--r-- | drivers/platform/x86/samsung-laptop.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index c1aa1b7580c7..21bc1a74d6aa 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c @@ -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 */ - if (acpi_video_backlight_support()) { - pr_info("Backlight controlled by ACPI video driver\n"); + if (acpi_video_backlight_support()) handle_backlight = false; - } #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(); +#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)) |