From abf0d35d811b2815f41aa3235fa5ca9a663db6e4 Mon Sep 17 00:00:00 2001
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 22:31:45 +0000
Subject: [PATCH] --- yaml --- r: 231569 b: refs/heads/master c:
 dafa73171be8dd31b485f5839e3376b1ca908e24 h: refs/heads/master i:   231567:
 81b846f4ddc8159f0615b682f8ab9537c195dc35 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/dma/amba-pl08x.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3b249429dc5f..a9464e121488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf072af461c166964fb110cfcafccd752fbb4c64
+refs/heads/master: dafa73171be8dd31b485f5839e3376b1ca908e24
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
index 69cfb05e4d3c..b3b3180ce561 100644
--- a/trunk/drivers/dma/amba-pl08x.c
+++ b/trunk/drivers/dma/amba-pl08x.c
@@ -1332,9 +1332,10 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan,
 	int ret;
 
 	num_llis = pl08x_fill_llis_for_desc(pl08x, txd);
-
-	if (!num_llis)
+	if (!num_llis) {
+		kfree(txd);
 		return -EINVAL;
+	}
 
 	spin_lock_irqsave(&plchan->lock, plchan->lockflags);