Merge git://www.linux-watchdog.org/linux-watchdog

[cascardo/linux.git] / drivers / remoteproc / wkup_m3_rproc.c

diff --git a/drivers/remoteproc/wkup_m3_rproc.c b/drivers/remoteproc/wkup_m3_rproc.c
index 02d271d..18175d0 100644 (file)
--- a/drivers/remoteproc/wkup_m3_rproc.c
+++ b/drivers/remoteproc/wkup_m3_rproc.c
@@ -167,6 +167,8 @@ static int wkup_m3_rproc_probe(struct platform_device *pdev)
                goto err;
        }
 
+       rproc->auto_boot = false;
+
        wkupm3 = rproc->priv;
        wkupm3->rproc = rproc;
        wkupm3->pdev = pdev;
@@ -206,7 +208,7 @@ static int wkup_m3_rproc_probe(struct platform_device *pdev)
        return 0;
 
 err_put_rproc:
-       rproc_put(rproc);
+       rproc_free(rproc);
 err:
        pm_runtime_put_noidle(dev);
        pm_runtime_disable(dev);
@@ -218,7 +220,7 @@ static int wkup_m3_rproc_remove(struct platform_device *pdev)
        struct rproc *rproc = platform_get_drvdata(pdev);
 
        rproc_del(rproc);
-       rproc_put(rproc);
+       rproc_free(rproc);
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);