Commit e5ffa401 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Vinod Koul

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: default avatarGuennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent eb262a54
...@@ -901,14 +901,9 @@ static int sh_dmae_remove(struct platform_device *pdev) ...@@ -901,14 +901,9 @@ static int sh_dmae_remove(struct platform_device *pdev)
{ {
struct sh_dmae_device *shdev = platform_get_drvdata(pdev); struct sh_dmae_device *shdev = platform_get_drvdata(pdev);
struct dma_device *dma_dev = &shdev->shdma_dev.dma_dev; 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); dma_async_device_unregister(dma_dev);
if (errirq > 0)
free_irq(errirq, shdev);
spin_lock_irq(&sh_dmae_lock); spin_lock_irq(&sh_dmae_lock);
list_del_rcu(&shdev->node); list_del_rcu(&shdev->node);
spin_unlock_irq(&sh_dmae_lock); spin_unlock_irq(&sh_dmae_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment