diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:18:29 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:18:29 +0530 |
| commit | f35d7633f5adfd7f93c0391b48ef78a14682e6b2 (patch) | |
| tree | 1b78835a9a527c246385e0c003c145eea33a83d6 /drivers/dma/mxs-dma.c | |
| parent | 4dfc9afe0d46caa309c5eaede841551d4056fefc (diff) | |
| parent | 86c7e6836479c4045a9a81ed5ea76c51d719f9c1 (diff) | |
| download | linux-f35d7633f5adfd7f93c0391b48ef78a14682e6b2.tar.bz2 | |
Merge branch 'topic/no_irq' into for-linus
Diffstat (limited to 'drivers/dma/mxs-dma.c')
| -rw-r--r-- | drivers/dma/mxs-dma.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 50e64e113ffb..e217268c7098 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -428,12 +428,10 @@ static int mxs_dma_alloc_chan_resources(struct dma_chan *chan) goto err_alloc; } - if (mxs_chan->chan_irq != NO_IRQ) { - ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler, - 0, "mxs-dma", mxs_dma); - if (ret) - goto err_irq; - } + ret = request_irq(mxs_chan->chan_irq, mxs_dma_int_handler, + 0, "mxs-dma", mxs_dma); + if (ret) + goto err_irq; ret = clk_prepare_enable(mxs_dma->clk); if (ret) |