DMA: shdma: fix a bad merge - remove free_irq()
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Mon, 26 Aug 2013 12:27:51 +0000 (14:27 +0200)
committerVinod Koul <vinod.koul@intel.com>
Tue, 27 Aug 2013 08:56:37 +0000 (14:26 +0530)
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>
drivers/dma/sh/shdmac.c

index 6128715973a44278014e620130d38e5794d85e25..33ce47eef0bff3e1bfe3de9a3763a89e0a6d61c6 100644 (file)
@@ -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);