summaryrefslogtreecommitdiff
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2018-01-31 11:20:29 +0300
committerVinod Koul <vinod.koul@intel.com>2018-01-31 11:20:29 +0300
commitc4cc2c3a24ec28323f844c8431301fd0bde2ba82 (patch)
tree944a71f616d20ae88e9dbf8625d77132d9135822 /drivers/dma
parentbcf73a7b300b5bb55c8df3dc7a6c460d64752673 (diff)
parenta8ffa34fa5384feeb44d9a47e1a050ec2f402545 (diff)
downloadlinux-c4cc2c3a24ec28323f844c8431301fd0bde2ba82.tar.xz
Merge branch 'topic/mic' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/mic_x100_dma.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/mic_x100_dma.c b/drivers/dma/mic_x100_dma.c
index 5ba5714d0b7c..94d7bd7d2880 100644
--- a/drivers/dma/mic_x100_dma.c
+++ b/drivers/dma/mic_x100_dma.c
@@ -480,9 +480,7 @@ static int mic_dma_setup_irq(struct mic_dma_chan *ch)
to_mbus_hw_ops(ch)->request_threaded_irq(to_mbus_device(ch),
mic_dma_intr_handler, mic_dma_thread_fn,
"mic dma_channel", ch, ch->ch_num);
- if (IS_ERR(ch->cookie))
- return PTR_ERR(ch->cookie);
- return 0;
+ return PTR_ERR_OR_ZERO(ch->cookie);
}
static inline void mic_dma_free_irq(struct mic_dma_chan *ch)