projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
68a75f3
)
staging: omap/drm: dmm should return proper errors
author
Rob Clark
<rob@ti.com>
Wed, 21 Mar 2012 21:40:23 +0000
(16:40 -0500)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Tue, 10 Apr 2012 16:46:30 +0000
(09:46 -0700)
Minor error path clean-up.
Signed-off-by: Rob Clark <rob@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/omapdrm/omap_dmm_tiler.c
patch
|
blob
|
history
diff --git
a/drivers/staging/omapdrm/omap_dmm_tiler.c
b/drivers/staging/omapdrm/omap_dmm_tiler.c
index
1ecb6a7
..
9d83060
100644
(file)
--- 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);