If we fail to prepare the ux500-hash clock before enabling it the
platform will fail to boot. Here we insure this happens.

Cc: Herbert Xu <herb...@gondor.apana.org.au>
Cc: David S. Miller <da...@davemloft.net>
Cc: Andreas Westin <andreas.wes...@stericsson.com>
Cc: linux-crypto@vger.kernel.org
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
 drivers/crypto/ux500/hash/hash_core.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/ux500/hash/hash_core.c 
b/drivers/crypto/ux500/hash/hash_core.c
index 632c333..118386a 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -308,10 +308,10 @@ static int hash_disable_power(
                device_data->restore_dev_state = true;
        }
 
-       clk_disable(device_data->clk);
+       clk_disable_unprepare(device_data->clk);
        ret = regulator_disable(device_data->regulator);
        if (ret)
-               dev_err(dev, "[%s] regulator_disable() failed!", __func__);
+               dev_err(dev, "[%s] regulator_disable_unprepare() failed!", 
__func__);
 
        device_data->power_state = false;
 
@@ -344,9 +344,9 @@ static int hash_enable_power(
                                        __func__);
                        goto out;
                }
-               ret = clk_enable(device_data->clk);
+               ret = clk_prepare_enable(device_data->clk);
                if (ret) {
-                       dev_err(dev, "[%s]: clk_enable() failed!",
+                       dev_err(dev, "[%s]: clk_prepare_enable() failed!",
                                        __func__);
                        ret = regulator_disable(
                                        device_data->regulator);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to