From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Mon, 26 Aug 2013 12:27:51 +0000 (+0200)
Subject: DMA: shdma: fix a bad merge - remove free_irq()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e5ffa401eacd0e74178e20ba932200fc9fe41c07;p=linux-beck.git

DMA: shdma: fix a bad merge - remove free_irq()

A bad merge resulted in a left-over free_irq() call. This patch removes it.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
---

diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 6128715973a4..33ce47eef0bf 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -901,14 +901,9 @@ static int sh_dmae_remove(struct platform_device *pdev)
 {
 	struct sh_dmae_device *shdev = platform_get_drvdata(pdev);
 	struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev;
-	struct resource *res;
-	int errirq = platform_get_irq(pdev, 0);
 
 	dma_async_device_unregister(dma_dev);
 
-	if (errirq > 0)
-		free_irq(errirq, shdev);
-
 	spin_lock_irq(&sh_dmae_lock);
 	list_del_rcu(&shdev->node);
 	spin_unlock_irq(&sh_dmae_lock);