summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 16:42:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-05-09 16:42:10 -0700
commit70eba4226d9718946941c7be0c8cb66d431e7686 (patch)
tree822ba5d9751731d954895e69cf1456cb803ff944 /fs
parent2d4fe27850420606155fb1f7d18ab2b40153e67b (diff)
parent47110b88912a997f25d42373e339804d51da98de (diff)
downloadlinux-3.10-70eba4226d9718946941c7be0c8cb66d431e7686.tar.gz
linux-3.10-70eba4226d9718946941c7be0c8cb66d431e7686.tar.bz2
linux-3.10-70eba4226d9718946941c7be0c8cb66d431e7686.zip
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
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
Diffstat (limited to 'fs')
-rw-r--r--fs/pstore/ram.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 32cbd7c8a90..1376e5a8f0d 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -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;
}