aboutsummaryrefslogtreecommitdiffstats
path: root/fs/pstore
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-05-07 19:39:20 +0800
committerTony Luck <tony.luck@intel.com>2013-05-08 10:24:48 -0700
commit47110b88912a997f25d42373e339804d51da98de (patch)
tree6641f4e44c016130c116fbb7d03c2772072d1ea7 /fs/pstore
parenteeb65d9cb5159752e672b5164110838bb5936a4a (diff)
downloadkernel_goldelico_gta04-47110b88912a997f25d42373e339804d51da98de.zip
kernel_goldelico_gta04-47110b88912a997f25d42373e339804d51da98de.tar.gz
kernel_goldelico_gta04-47110b88912a997f25d42373e339804d51da98de.tar.bz2
pstore/ram: fix error return code in ramoops_probe()
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'fs/pstore')
-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 38babb3..82e74dd 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -429,6 +429,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;
}
@@ -446,6 +447,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;
}