summaryrefslogtreecommitdiffstats
path: root/drivers/staging/omapdrm
diff options
context:
space:
mode:
authorRob Clark <rob@ti.com>2012-03-21 16:40:23 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-10 09:46:30 -0700
commit1c3a4dc3d01547103a81957d41f105d462f42c4d (patch)
treed6c2805cf0faa2969007308a20caeff0d94a36aa /drivers/staging/omapdrm
parent68a75f3f1aeae099388f63e4cec3ad08aff8e7da (diff)
downloadlinux-1c3a4dc3d01547103a81957d41f105d462f42c4d.tar.gz
linux-1c3a4dc3d01547103a81957d41f105d462f42c4d.tar.bz2
linux-1c3a4dc3d01547103a81957d41f105d462f42c4d.zip
staging: omap/drm: dmm should return proper errors
Minor error path clean-up. Signed-off-by: Rob Clark <rob@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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c
index 1ecb6a73d790..9d83060e753a 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -347,7 +347,7 @@ struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,
ret = tcm_reserve_2d(containers[fmt], w, h, align, &block->area);
if (ret) {
kfree(block);
- return 0;
+ return ERR_PTR(-ENOMEM);
}
/* add to allocation list */
@@ -371,7 +371,7 @@ struct tiler_block *tiler_reserve_1d(size_t size)
if (tcm_reserve_1d(containers[TILFMT_PAGE], num_pages,
&block->area)) {
kfree(block);
- return 0;
+ return ERR_PTR(-ENOMEM);
}
spin_lock(&omap_dmm->list_lock);