diff options
| author | Shuah Khan <shuah.khan@hp.com> | 2013-03-09 11:39:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-19 10:54:38 -0700 |
| commit | c43bab8955fbdcf7dab17cfd0fa5eab40b4ac88c (patch) | |
| tree | ec9d67ff5c2eb9396604a8d53b594e441dc9705d | |
| parent | bca778136280b1ab9f2d23b94670ad5ba63c1f94 (diff) | |
| download | linux-3.10-c43bab8955fbdcf7dab17cfd0fa5eab40b4ac88c.tar.gz linux-3.10-c43bab8955fbdcf7dab17cfd0fa5eab40b4ac88c.tar.bz2 linux-3.10-c43bab8955fbdcf7dab17cfd0fa5eab40b4ac88c.zip | |
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@suse.de>
Signed-off-by: Shuah Khan <shuah.khan@hp.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 22b2dfa7314..fdacfcebd17 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 |