Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7783819920ca52fc582a2782f654fe6ed373f465

Authored by Shuah Khan
Committed by Matthew Garrett
1 parent 5dd760b813
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

hp_accel: Ignore the error from lis3lv02d_poweron() at resume 

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>
CC: stable@vger.kernel.org 3.8, 3.4, 3.5, 3.2
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/platform/x86/hp_accel.c
Diff comments   View file @ 7783819
... ... @@ -362,7 +362,8 @@
362 362  
363 363 static int lis3lv02d_resume(struct device *dev)
364 364 {
365   - return lis3lv02d_poweron(&lis3_dev);
  365 + lis3lv02d_poweron(&lis3_dev);
  366 + return 0;
366 367 }
367 368  
368 369 static SIMPLE_DEV_PM_OPS(hp_accel_pm, lis3lv02d_suspend, lis3lv02d_resume);