---

yaml --- r: 273875 b: refs/heads/master c: 57001a6 h: refs/heads/master i: 273873: a6516af 273871: 59e149d v: v3
git-mirror · Aug 25, 2011 · 6fdfed1 · 6fdfed1
1 parent 8c898c1
commit 6fdfed1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a2356572b1910cc977f4ccf3c9ee1ecab08327a
+refs/heads/master: 57001a606f845ce2eda21a0f23e6aab20ee0cb04
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
@@ -1174,7 +1174,9 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
 
 	num_llis = pl08x_fill_llis_for_desc(pl08x, txd);
 	if (!num_llis) {
-		kfree(txd);
+		spin_lock_irqsave(&plchan->lock, flags);
+		pl08x_free_txd(pl08x, txd);
+		spin_unlock_irqrestore(&plchan->lock, flags);
 		return -EINVAL;
 	}