crypto: sahara - propagate the error on clk_disable_unprepare() failure
authorFabio Estevam <fabio.estevam@freescale.com>
Sat, 20 Jun 2015 18:30:22 +0000 (15:30 -0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Sun, 21 Jun 2015 11:59:28 +0000 (19:59 +0800)
clk_prepare_enable() may fail, so we should better check its return value
and propagate it in the case of error.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/sahara.c

index 6be377f6b9e7019c44ba0e5b303b1d7cdd918170..397a500b3d8a9edbaf214ae28a8cc88e64582eb0 100644 (file)
@@ -1578,8 +1578,12 @@ static int sahara_probe(struct platform_device *pdev)
 
        init_completion(&dev->dma_completion);
 
-       clk_prepare_enable(dev->clk_ipg);
-       clk_prepare_enable(dev->clk_ahb);
+       err = clk_prepare_enable(dev->clk_ipg);
+       if (err)
+               goto err_link;
+       err = clk_prepare_enable(dev->clk_ahb);
+       if (err)
+               goto clk_ipg_disable;
 
        version = sahara_read(dev, SAHARA_REG_VERSION);
        if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx27-sahara")) {
@@ -1619,10 +1623,11 @@ err_algs:
        dma_free_coherent(&pdev->dev,
                          SAHARA_MAX_HW_LINK * sizeof(struct sahara_hw_link),
                          dev->hw_link[0], dev->hw_phys_link[0]);
-       clk_disable_unprepare(dev->clk_ipg);
-       clk_disable_unprepare(dev->clk_ahb);
        kthread_stop(dev->kthread);
        dev_ptr = NULL;
+       clk_disable_unprepare(dev->clk_ahb);
+clk_ipg_disable:
+       clk_disable_unprepare(dev->clk_ipg);
 err_link:
        dma_free_coherent(&pdev->dev,
                          2 * AES_KEYSIZE_128,