From 122f735361f689af8266f5d6593207a6337d193f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 23 Sep 2011 09:16:01 +0300
Subject: [PATCH] --- yaml --- r: 273910 b: refs/heads/master c:
 f80befe081576219379debf6611f02c9f3b01c41 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9cab8d7c0533..afc553850706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a1cd9ad87979744e1510782b25c38feb9602739
+refs/heads/master: f80befe081576219379debf6611f02c9f3b01c41
diff --git a/trunk/drivers/dma/timb_dma.c b/trunk/drivers/dma/timb_dma.c
index 6dbdf451128e..a4a398f2ef61 100644
--- a/trunk/drivers/dma/timb_dma.c
+++ b/trunk/drivers/dma/timb_dma.c
@@ -762,7 +762,7 @@ static int __devinit td_probe(struct platform_device *pdev)
 		if ((i % 2) == pchan->rx) {
 			dev_err(&pdev->dev, "Wrong channel configuration\n");
 			err = -EINVAL;
-			goto err_tasklet_kill;
+			goto err_free_irq;
 		}
 
 		td_chan->chan.device = &td->dma;