Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / omap-des.c

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index ec5f13162b733c027d1b2c8d2df2ac2def08c4d8..b8bc84be874178397e7c3ccf51e1bbca2e926634 100644 (file)
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -223,12 +223,19 @@ static void omap_des_write_n(struct omap_des_dev *dd, u32 offset,
 
 static int omap_des_hw_init(struct omap_des_dev *dd)
 {
+       int err;
+
        /*
         * clocks are enabled when request starts and disabled when finished.
         * It may be long delays between requests.
         * Device might go to off mode to save power.
         */
-       pm_runtime_get_sync(dd->dev);
+       err = pm_runtime_get_sync(dd->dev);
+       if (err < 0) {
+               pm_runtime_put_noidle(dd->dev);
+               dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
+               return err;
+       }
 
        if (!(dd->flags & FLAGS_INIT)) {
                dd->flags |= FLAGS_INIT;
@@ -1074,16 +1081,20 @@ static int omap_des_probe(struct platform_device *pdev)
        if (err)
                goto err_res;
 
-       dd->io_base = devm_request_and_ioremap(dev, res);
-       if (!dd->io_base) {
-               dev_err(dev, "can't ioremap\n");
-               err = -ENOMEM;
+       dd->io_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(dd->io_base)) {
+               err = PTR_ERR(dd->io_base);
                goto err_res;
        }
        dd->phys_base = res->start;
 
        pm_runtime_enable(dev);
-       pm_runtime_get_sync(dev);
+       err = pm_runtime_get_sync(dev);
+       if (err < 0) {
+               pm_runtime_put_noidle(dev);
+               dev_err(dd->dev, "%s: failed to get_sync(%d)\n", __func__, err);
+               goto err_get;
+       }
 
        omap_des_dma_stop(dd);
 
@@ -1148,6 +1159,7 @@ err_algs:
 err_irq:
        tasklet_kill(&dd->done_task);
        tasklet_kill(&dd->queue_task);
+err_get:
        pm_runtime_disable(dev);
 err_res:
        dd = NULL;
@@ -1191,7 +1203,14 @@ static int omap_des_suspend(struct device *dev)
 
 static int omap_des_resume(struct device *dev)
 {
-       pm_runtime_get_sync(dev);
+       int err;
+
+       err = pm_runtime_get_sync(dev);
+       if (err < 0) {
+               pm_runtime_put_noidle(dev);
+               dev_err(dev, "%s: failed to get_sync(%d)\n", __func__, err);
+               return err;
+       }
        return 0;
 }
 #endif