From: Andy Gross Date: Fri, 16 Nov 2012 19:10:57 +0000 (-0600) Subject: staging: drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR X-Git-Tag: firefly_0821_release~3680^2~1519^2~296 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;ds=sidebyside;h=295c799ae45b3678d9b8d3e845635ed07ce3b66a;p=firefly-linux-kernel-4.4.55.git staging: drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR Return -ENOMEM if dmm_txn_init cannot allocate a refill engine. v2: Fix typing issue seen with newer compilers Signed-off-by: Andy Gross Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 5c809c056859..59bf43899fc0 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -296,7 +296,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(-ENOMEM); + return -ENOMEM; tcm_for_each_slice(slice, *area, area_s) { struct pat_area p_area = {