diff options
author | Andy Gross <andy.gross@ti.com> | 2012-11-16 13:10:57 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-16 15:03:10 -0800 |
commit | 295c799ae45b3678d9b8d3e845635ed07ce3b66a (patch) | |
tree | 36cf2c2aeb9cb35892cc230a679b4cf0dc38582d /drivers | |
parent | 9d36976fad3008fcc4209789566f7f3e7763f212 (diff) |
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 <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 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 = { |