[ 3.8.y.z extended stable ] Patch "hp_accel: Ignore the error from lis3lv02d_poweron() at resume" has been added to staging queue

Kamal Mostafa kamal at canonical.com
Wed May 22 21:55:26 UTC 2013


This is a note to let you know that I have just added a patch titled

    hp_accel: Ignore the error from lis3lv02d_poweron() at resume

to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.8.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From e2a7b4329cd32af44c7fe1d9294e5b0b94424376 Mon Sep 17 00:00:00 2001
From: Shuah Khan <shuah.khan at hp.com>
Date: Sat, 9 Mar 2013 11:39:22 -0700
Subject: hp_accel: Ignore the error from lis3lv02d_poweron() at resume

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 at suse.de>
Signed-off-by: Shuah Khan <shuah.khan at hp.com>
Signed-off-by: Matthew Garrett <matthew.garrett at nebula.com>
Signed-off-by: Kamal Mostafa <kamal at 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 18d74f2..1c43168 100644
--- a/drivers/platform/x86/hp_accel.c
+++ b/drivers/platform/x86/hp_accel.c
@@ -362,7 +362,8 @@ static int lis3lv02d_suspend(struct device *dev)

 static int lis3lv02d_resume(struct device *dev)
 {
-	return lis3lv02d_poweron(&lis3_dev);
+	lis3lv02d_poweron(&lis3_dev);
+	return 0;
 }

 static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume);
--
1.8.1.2





More information about the kernel-team mailing list