Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4cc2c3a authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/mic' into for-linus

parents bcf73a7b a8ffa34f

drivers/dma/mic_x100_dma.c

+1 −3
Original line number Diff line number Diff line
@@ -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)