lkml.org 
[lkml]   [2010]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/97] ACPI: Use the return result of ACPI lid notifier chain correctly
    Date
    From: Zhao Yakui <yakui.zhao@intel.com>

    commit 13c199c0d0cf78b27592991129fb8cbcfc5164de upstream.

    On some laptops it will return NOTIFY_OK(non-zero) when calling the ACPI LID
    notifier. Then it is used as the result of ACPI LID resume function, which
    will complain the following warning message in course of suspend/resume:

    >PM: Device PNP0C0D:00 failed to resume: error 1

    This patch is to eliminate the above warning message.

    http://bugzilla.kernel.org/show_bug.cgi?id=14782

    Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/acpi/button.c | 7 +++++++
    1 files changed, 7 insertions(+), 0 deletions(-)

    diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
    index 0c9c6a9..8a95e83 100644
    --- a/drivers/acpi/button.c
    +++ b/drivers/acpi/button.c
    @@ -282,6 +282,13 @@ static int acpi_lid_send_state(struct acpi_device *device)
    if (ret == NOTIFY_DONE)
    ret = blocking_notifier_call_chain(&acpi_lid_notifier, state,
    device);
    + if (ret == NOTIFY_DONE || ret == NOTIFY_OK) {
    + /*
    + * It is also regarded as success if the notifier_chain
    + * returns NOTIFY_OK or NOTIFY_DONE.
    + */
    + ret = 0;
    + }
    return ret;
    }

    --
    1.6.6


    \
     
     \ /
      Last update: 2010-01-05 01:57    [W:0.027 / U:60.496 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site