Re: [PATCH V2] crypto: omap-des - handle error of pm_runtime_get_sync

[Felipe Balbi]

On Tue, Apr 15, 2014 at 11:58:31AM -0500, Nishanth Menon wrote:
> pm_runtime_get_sync may not always succeed depending on SoC involved.
> So handle the error appropriately ensuring usage_count is accurate in
> case of failure.
> 
> Signed-off-by: Nishanth Menon <nm@xxxxxx>

Reviewed-by: Felipe Balbi <balbi@xxxxxx>

> ---
> V2:
> 	- review fixes, print function names in error log as well.
> 
> V1: https://patchwork.kernel.org/patch/3993861/
>  drivers/crypto/omap-des.c |   26 +++++++++++++++++++++++---
>  1 file changed, 23 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
> index ec5f131..1d570c4 100644
> --- 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;
> @@ -1083,7 +1090,12 @@ static int omap_des_probe(struct platform_device *pdev)
>  	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 +1160,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 +1204,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
> -- 
> 1.7.9.5
> 

-- 
balbi

Attachment: signature.asc
Description: Digital signature