remoteproc: st: Fix error return code in st_rproc_probe()
authorWei Yongjun <weiyongjun1@huawei.com>
Mon, 17 Oct 2016 16:23:35 +0000 (16:23 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 19 Jan 2017 19:18:06 +0000 (20:18 +0100)
commit 1d701d3dd8caf6660ff33c3c23a115b4649c5cdb upstream.

Fix to return a negative error code from the st_rproc_state() error
handling case instead of 0, as done elsewhere in this function.

Fixes: 63edb0310a5c ("remoteproc: Supply controller driver for ST's Remote Processors")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/remoteproc/st_remoteproc.c

index ae8963fcc8c8f8f2b0ccb3cedc43f2419eddb6f9..da4e152e97331fbed605887430dddbe22947c9ff 100644 (file)
@@ -245,8 +245,10 @@ static int st_rproc_probe(struct platform_device *pdev)
                goto free_rproc;
 
        enabled = st_rproc_state(pdev);
-       if (enabled < 0)
+       if (enabled < 0) {
+               ret = enabled;
                goto free_rproc;
+       }
 
        if (enabled) {
                atomic_inc(&rproc->power);