diff --git a/[refs] b/[refs] index 6dab8c015151..e344cad7c073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 201e4aca5aa179e6c69a4dcd36a3562e56b8d670 +refs/heads/master: 25b63da64708212985c06c7f8b089d356efdd9cf diff --git a/trunk/fs/pstore/ram_core.c b/trunk/fs/pstore/ram_core.c index 235513c46aaf..f6650d12c0c1 100644 --- a/trunk/fs/pstore/ram_core.c +++ b/trunk/fs/pstore/ram_core.c @@ -406,6 +406,7 @@ static int __init persistent_ram_post_init(struct persistent_ram_zone *prz, bool " size %zu, start %zu\n", buffer_size(prz), buffer_start(prz)); persistent_ram_save_old(prz); + return 0; } } else { pr_info("persistent_ram: no valid data in buffer"