Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 23:42:10 +0000 (16:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 23:42:10 +0000 (16:42 -0700)
Pull trivial pstore update from Tony Luck:
 "Couple of pstore cleanups"

It turns out that the kmemdup() conversion ends up being undone by the
fact that the memory block also needed the ecc information (see commit
bd08ec33b5c2: "pstore/ram: Restore ecc information block"), so all that
remains after merging is the error return code change.

* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  pstore/ram: fix error return code in ramoops_probe()
  fs: pstore: Replaced calls to kmalloc and memcpy with kmemdup

fs/pstore/ram.c

index 32cbd7c8a90c0240457c495f5ab81ca09052e15b..1376e5a8f0d6c6cfa430f87ed31d36cc9af5e007 100644 (file)
@@ -438,6 +438,7 @@ static int ramoops_probe(struct platform_device *pdev)
                pr_err("memory size too small, minimum is %zu\n",
                        cxt->console_size + cxt->record_size +
                        cxt->ftrace_size);
+               err = -EINVAL;
                goto fail_cnt;
        }
 
@@ -455,6 +456,7 @@ static int ramoops_probe(struct platform_device *pdev)
        spin_lock_init(&cxt->pstore.buf_lock);
        if (!cxt->pstore.buf) {
                pr_err("cannot allocate pstore buffer\n");
+               err = -ENOMEM;
                goto fail_clear;
        }