summaryrefslogtreecommitdiff
path: root/drivers/staging/omapdrm
diff options
context:
space:
mode:
authorAndy Gross <andy.gross@ti.com>2012-11-13 21:41:32 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-13 23:14:59 (GMT)
commit743815ae1bbd2790321a3ab1f23abb82c1fdd45b (patch)
tree1601e111d2e0489d056d563c4af61383867487be /drivers/staging/omapdrm
parentbe3c5126b553cc807d112a5010a10f8e5bee5427 (diff)
downloadlinux-fsl-qoriq-743815ae1bbd2790321a3ab1f23abb82c1fdd45b.tar.xz
staging: drm/omap: Fix usage of IS_ERR_OR_NULL and PTR_ERR
Return PTR_ERR(-ENOMEM) if dmm_txn_init cannot allocate a refill engine. Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/omapdrm')
-rw-r--r--drivers/staging/omapdrm/omap_dmm_tiler.c2
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 4d138df..5c809c0 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(txn);
+ return PTR_ERR(-ENOMEM);
tcm_for_each_slice(slice, *area, area_s) {
struct pat_area p_area = {