Commit 76992675 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'counter-fixes-for-6.18' of... 

Merge tag 'counter-fixes-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-next

William writes:

Counter fixes for 6.18

A fix to permit multiple counter channels to share the same TCB IRQ line
for microchip-tcb-cpature.

* tag 'counter-fixes-for-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wbg/counter:
  counter: microchip-tcb-capture: Allow shared IRQ for multi-channel TCBs
parents dcb6fa37 109ff654

drivers/counter/microchip-tcb-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static void mchp_tc_irq_remove(void *ptr) 
static int mchp_tc_irq_enable(struct counter_device *const counter, int irq)

{

	struct mchp_tc_data *const priv = counter_priv(counter);

	int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, 0,

	int ret = devm_request_irq(counter->parent, irq, mchp_tc_isr, IRQF_SHARED,

				   dev_name(counter->parent), counter);



	if (ret < 0)