Merge tag 'media/v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / fs / pstore / platform.c

diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index c4c9a10c5760e057ef7b019e1013d472a2ccaabb..791743deedf1b389177225a66d5a0967f2026b25 100644 (file)
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -299,7 +299,7 @@ static void pstore_dump(struct kmsg_dumper *dumper,
                bool compressed;
                size_t total_len;
 
-               if (big_oops_buf) {
+               if (big_oops_buf && is_locked) {
                        dst = big_oops_buf;
                        hsize = sprintf(dst, "%s#%d Part%u\n", why,
                                                        oopscount, part);
@@ -456,6 +456,12 @@ int pstore_register(struct pstore_info *psi)
                add_timer(&pstore_timer);
        }
 
+       /*
+        * Update the module parameter backend, so it is visible
+        * through /sys/module/pstore/parameters/backend
+        */
+       backend = psi->name;
+
        pr_info("Registered %s as persistent store backend\n", psi->name);
 
        return 0;