lkml.org 
[lkml]   [2013]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 075/115] hp_accel: Ignore the error from lis3lv02d_poweron() at resume
    Date
    3.5.7.13 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Shuah Khan <shuah.khan@hp.com>

    commit 7783819920ca52fc582a2782f654fe6ed373f465 upstream.

    The error in lis3lv02_poweron() is harmless in the resume path, so
    we should ignore it. It is inline with the other usages of lis3lv02_poweron()
    and matches the 3.0 code for this routine. This patch is in suse git and
    might have missed making it into the mainline.
    opensuse - commit id: 66ccdac87c322cf7af12bddba8c805af640b1cff

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Shuah Khan <shuah.khan@hp.com>
    Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
    [ luis: adjust context ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/platform/x86/hp_accel.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c
    index 22b2dfa..fdacfce 100644
    --- a/drivers/platform/x86/hp_accel.c
    +++ b/drivers/platform/x86/hp_accel.c
    @@ -362,7 +362,8 @@ static int lis3lv02d_suspend(struct acpi_device *device, pm_message_t state)

    static int lis3lv02d_resume(struct acpi_device *device)
    {
    - return lis3lv02d_poweron(&lis3_dev);
    + lis3lv02d_poweron(&lis3_dev);
    + return 0;
    }
    #else
    #define lis3lv02d_suspend NULL
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-20 13:41    [W:4.073 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site