Commit c4cc2c3a authored by Vinod Koul's avatar Vinod Koul

Merge branch 'topic/mic' into for-linus

parents bcf73a7b a8ffa34f
...@@ -480,9 +480,7 @@ static int mic_dma_setup_irq(struct mic_dma_chan *ch) ...@@ -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), to_mbus_hw_ops(ch)->request_threaded_irq(to_mbus_device(ch),
mic_dma_intr_handler, mic_dma_thread_fn, mic_dma_intr_handler, mic_dma_thread_fn,
"mic dma_channel", ch, ch->ch_num); "mic dma_channel", ch, ch->ch_num);
if (IS_ERR(ch->cookie)) return PTR_ERR_OR_ZERO(ch->cookie);
return PTR_ERR(ch->cookie);
return 0;
} }
static inline void mic_dma_free_irq(struct mic_dma_chan *ch) static inline void mic_dma_free_irq(struct mic_dma_chan *ch)
......
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