From f9dce112b30f39ccf98673ad3851aded8f32ddb5 Mon Sep 17 00:00:00 2001 From: Andy Gross Date: Thu, 9 Aug 2012 00:14:56 -0500 Subject: [PATCH] --- yaml --- r: 324490 b: refs/heads/master c: d7de993503aa23f34d58b7945cf00ad9a9486bda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_dmm_tiler.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 78cdac960199..a4065b8d5e9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd025b8fd819751496e53acdc22a5d3c9b7bfe2d +refs/heads/master: d7de993503aa23f34d58b7945cf00ad9a9486bda diff --git a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c index 86197831f63e..ec7a5c8f5363 100644 --- a/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/trunk/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -120,7 +120,7 @@ static int wait_status(struct refill_engine *engine, uint32_t wait_mask) return 0; } -irqreturn_t omap_dmm_irq_handler(int irq, void *arg) +static irqreturn_t omap_dmm_irq_handler(int irq, void *arg) { struct dmm *dmm = arg; uint32_t status = readl(dmm->base + DMM_PAT_IRQSTATUS); @@ -367,7 +367,7 @@ struct tiler_block *tiler_reserve_1d(size_t size) int num_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; if (!block) - return 0; + return ERR_PTR(-ENOMEM); block->fmt = TILFMT_PAGE;