diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-07-07 23:43:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2010-07-19 02:00:35 +0200 |
| commit | d074ee023fa3a4681b64223c5e636102c39628c4 (patch) | |
| tree | 830000adb529463806773d819fe20d76ac0388c5 /kernel/power/hibernate.c | |
| parent | f6f71f187518477cecc01cd887933b5da19585e6 (diff) | |
| download | op-kernel-dev-d074ee023fa3a4681b64223c5e636102c39628c4.zip op-kernel-dev-d074ee023fa3a4681b64223c5e636102c39628c4.tar.gz | |
PM / Hibernate: Fix snapshot error code path
There is an inconsistency between hibernation_platform_enter()
and hibernation_snapshot(), because the latter calls
hibernation_ops->end() after failing hibernation_ops->begin(), while
the former doesn't do that. Make hibernation_snapshot() behave in
the same way as hibernation_platform_enter() in that respect.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/hibernate.c')
| -rw-r--r-- | kernel/power/hibernate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index d97ba86..d26f04e 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -330,7 +330,7 @@ int hibernation_snapshot(int platform_mode) error = platform_begin(platform_mode); if (error) - return error; + goto Close; /* Preallocate image memory before shutting down devices. */ error = hibernate_preallocate_memory(); |
