lkml.org 
[lkml]   [2012]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 003/105] samsung-laptop: make the dmi check less strict (part 2)
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ben Hutchings <ben@decadent.org.uk>

    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>
    ---
    --- 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))



    \
     
     \ /
      Last update: 2012-10-29 01:01    [W:4.022 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site