On 3 May 2013 16:32, Lee Jones <lee.jones@xxxxxxxxxx> wrote:
> 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 <herbert@xxxxxxxxxxxxxxxxxxx>
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> Cc: Andreas Westin <andreas.westin@xxxxxxxxxxxxxx>
> Cc: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> Cc: linux-crypto@xxxxxxxxxxxxxxx
> Acked-by: Arnd Bergmann <arnd@xxxxxxxx>
> Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
> drivers/crypto/ux500/hash/hash_core.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
> index 632c333..1e8b2f3 100644
> --- a/drivers/crypto/ux500/hash/hash_core.c
> +++ b/drivers/crypto/ux500/hash/hash_core.c
> @@ -1727,11 +1727,17 @@ static int ux500_hash_probe(struct platform_device *pdev)
> goto out_regulator;
> }
>
> + ret = clk_prepare(device_data->clk);
> + if (ret) {
> + dev_err(dev, "[%s] clk_prepare() failed!", __func__);
> + goto out_clk;
> + }
> +
> /* Enable device power (and clock) */
> ret = hash_enable_power(device_data, false);
> if (ret) {
> dev_err(dev, "[%s]: hash_enable_power() failed!", __func__);
> - goto out_clk;
> + goto out_clk_unprepare;
> }
>
> ret = hash_check_hw(device_data);
> @@ -1763,6 +1769,9 @@ static int ux500_hash_probe(struct platform_device *pdev)
> out_power:
> hash_disable_power(device_data, false);
>
> +out_clk_unprepare:
> + clk_unprepare(device_data->clk);
> +
> out_clk:
> clk_put(device_data->clk);
>
> @@ -1827,6 +1836,7 @@ static int ux500_hash_remove(struct platform_device *pdev)
> dev_err(dev, "[%s]: hash_disable_power() failed",
> __func__);
>
> + clk_unprepare(device_data->clk);
> clk_put(device_data->clk);
> regulator_put(device_data->regulator);
>
> --
> 1.7.10.4
>
Acked-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
