diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 09:37:13 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 09:37:13 -0400 |
| commit | 3bda03865fcaf5e30248bf4b7b37a81f6966caf9 (patch) | |
| tree | 40e1edb696326bfbd028afc271e7272d87b6b506 /kernel/power/hibernate.c | |
| parent | kvm: Disable objtool frame pointer checking for vmenter.S (diff) | |
| parent | MAINTAINERS: add a reviewer for KVM/s390 (diff) | |
| download | linux-rng-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.tar.xz linux-rng-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.zip | |
Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix for 5.7 and maintainer update
- Silence false positive lockdep warning
- add Claudio as reviewer
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 6dbeedb7354c..86aba8706b16 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -678,7 +678,7 @@ static int load_image_and_restore(void) error = swsusp_read(&flags); swsusp_close(FMODE_READ); if (!error) - hibernation_restore(flags & SF_PLATFORM_MODE); + error = hibernation_restore(flags & SF_PLATFORM_MODE); pr_err("Failed to load image, recovering.\n"); swsusp_free(); |