[PATCH] drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR

Jani Nikula jani.nikula at linux.intel.com
Fri Nov 23 00:10:56 PST 2012


On Tue, 13 Nov 2012, Andy Gross <andy.gross at ti.com> wrote:
> Return PTR_ERR(-ENOMEM) if dmm_txn_init cannot allocate a
> refill engine.
>
> Signed-off-by: Andy Gross <andy.gross at ti.com>
> ---
>  drivers/staging/omapdrm/omap_dmm_tiler.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
> index 3ae3955..1a5a7ca 100644
> --- a/drivers/staging/omapdrm/omap_dmm_tiler.c
> +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
> @@ -279,7 +279,7 @@ static int fill(struct tcm_area *area, struct page **pages,
>  
>  	txn = dmm_txn_init(omap_dmm, area->tcm);
>  	if (IS_ERR_OR_NULL(txn))
> -		return PTR_ERR(txn);
> +		return PTR_ERR(-ENOMEM);

return -ENOMEM;

BR,
Jani.

>  
>  	tcm_for_each_slice(slice, *area, area_s) {
>  		struct pat_area p_area = {
> -- 
> 1.7.5.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel


More information about the dri-devel mailing list