diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-05-07 07:39:20 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2013-05-08 13:24:48 -0400 |
commit | 47110b88912a997f25d42373e339804d51da98de (patch) | |
tree | 6641f4e44c016130c116fbb7d03c2772072d1ea7 /fs/pstore | |
parent | eeb65d9cb5159752e672b5164110838bb5936a4a (diff) |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 38babb3a9384..82e74dd50b6c 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c | |||
@@ -429,6 +429,7 @@ static int ramoops_probe(struct platform_device *pdev) | |||
429 | pr_err("memory size too small, minimum is %zu\n", | 429 | pr_err("memory size too small, minimum is %zu\n", |
430 | cxt->console_size + cxt->record_size + | 430 | cxt->console_size + cxt->record_size + |
431 | cxt->ftrace_size); | 431 | cxt->ftrace_size); |
432 | err = -EINVAL; | ||
432 | goto fail_cnt; | 433 | goto fail_cnt; |
433 | } | 434 | } |
434 | 435 | ||
@@ -446,6 +447,7 @@ static int ramoops_probe(struct platform_device *pdev) | |||
446 | spin_lock_init(&cxt->pstore.buf_lock); | 447 | spin_lock_init(&cxt->pstore.buf_lock); |
447 | if (!cxt->pstore.buf) { | 448 | if (!cxt->pstore.buf) { |
448 | pr_err("cannot allocate pstore buffer\n"); | 449 | pr_err("cannot allocate pstore buffer\n"); |
450 | err = -ENOMEM; | ||
449 | goto fail_clear; | 451 | goto fail_clear; |
450 | } | 452 | } |
451 | 453 | ||