Return-Path: Message-Id: <20130603221153.838851512@goodmis.org> Date: Mon, 03 Jun 2013 18:10:26 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Shuah Khan , Matthew Garrett Subject: [10/65] hp_accel: Ignore the error from lis3lv02d_poweron() at resume References: <20130603221016.243553628@goodmis.org> Content-Disposition: inline; filename=0010-hp_accel-Ignore-the-error-from-lis3lv02d_poweron-at-.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.6.11.5 stable review patch. If anyone has any objections, please let me know. ------------------ From: Shuah Khan [ Upstream commit 7783819920ca52fc582a2782f654fe6ed373f465 ] 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 Signed-off-by: Shuah Khan CC: stable@vger.kernel.org 3.8, 3.4, 3.5, 3.2 Signed-off-by: Matthew Garrett Signed-off-by: Steven Rostedt --- 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 6b9af98..45f6b5c 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.7.10.4