summaryrefslogtreecommitdiffstats
path: root/drivers/staging/omapdrm
diff options
context:
space:
mode:
authorAndy Gross2012-11-16 20:10:57 +0100
committerGreg Kroah-Hartman2012-11-17 00:03:10 +0100
commit295c799ae45b3678d9b8d3e845635ed07ce3b66a (patch)
tree36cf2c2aeb9cb35892cc230a679b4cf0dc38582d /drivers/staging/omapdrm
parentstaging/serqt_usb2: Refactor qt_status_change_check() in serqt_usb2.c (diff)
downloadkernel-qcow2-linux-295c799ae45b3678d9b8d3e845635ed07ce3b66a.tar.gz
kernel-qcow2-linux-295c799ae45b3678d9b8d3e845635ed07ce3b66a.tar.xz
kernel-qcow2-linux-295c799ae45b3678d9b8d3e845635ed07ce3b66a.zip
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/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 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 = {