]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
pstore/ram: fix error return code in ramoops_probe()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 7 May 2013 11:39:20 +0000 (19:39 +0800)
committerTony Luck <tony.luck@intel.com>
Wed, 8 May 2013 17:24:48 +0000 (10:24 -0700)
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>
fs/pstore/ram.c

index 38babb3a9384769e6373dee5ad069febb846f451..82e74dd50b6c642b0d3dd6cf3eb1458cc2448bfa 100644 (file)
@@ -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;
        }