---

yaml --- r: 332878 b: refs/heads/master c: 0274788 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · f462a67 · f462a67
1 parent ca759ee
commit f462a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);