From f462a6765f5d8f4883f9b01591dc215ed8e639f7 Mon Sep 17 00:00:00 2001
From: Inderpal Singh <inderpal.singh@linaro.org>
Date: Mon, 17 Sep 2012 09:57:45 +0530
Subject: [PATCH] --- yaml --- r: 332878 b: refs/heads/master c:
 027478851791df751176398be02a3b1c5f6aa824 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/dma/pl330.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1441254b3de8..4f449d41e904 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c71b8eb268ee38235f7e924d943ea9d90e59469
+refs/heads/master: 027478851791df751176398be02a3b1c5f6aa824
diff --git a/trunk/drivers/dma/pl330.c b/trunk/drivers/dma/pl330.c
index 7e543698fa23..28322dced886 100644
--- a/trunk/drivers/dma/pl330.c
+++ b/trunk/drivers/dma/pl330.c
@@ -2390,7 +2390,7 @@ static int pl330_alloc_chan_resources(struct dma_chan *chan)
 	pch->pl330_chid = pl330_request_channel(&pdmac->pif);
 	if (!pch->pl330_chid) {
 		spin_unlock_irqrestore(&pch->lock, flags);
-		return 0;
+		return -ENOMEM;
 	}
 
 	tasklet_init(&pch->task, pl330_tasklet, (unsigned long) pch);