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 <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
index 5c809c0568597e339cbf31dfc815e97394c223f5..59bf43899fc09d20ac5c01a0c1894f4b166bc189 100644 (file)
--- 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 = {