diff options
| author | Shuah Khan <shuah.khan@hp.com> | 2013-03-09 11:39:22 -0700 |
|---|---|---|
| committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-05-08 19:59:44 -0400 |
| commit | 7783819920ca52fc582a2782f654fe6ed373f465 (patch) | |
| tree | 6bcd65e891558fb7bf18395709800157bcab8b12 /drivers/platform | |
| parent | 5dd760b8131916dcf3680d1873d05df421c93a0c (diff) | |
| download | linux-stable-7783819920ca52fc582a2782f654fe6ed373f465.tar.gz linux-stable-7783819920ca52fc582a2782f654fe6ed373f465.tar.bz2 linux-stable-7783819920ca52fc582a2782f654fe6ed373f465.zip | |
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>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/hp_accel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp_accel.c b/drivers/platform/x86/hp_accel.c index e64a7a870d42..a8e43cf70fac 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); |