Merge "soc: swr-mstr: Fix KW issue in swrm_remove" (8de21409) · Commits · e / devices / android_kernel_fairphone_FP5

soc/swr-mstr-ctrl.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -2743,6 +2743,7 @@ static int swrm_probe(struct platform_device *pdev)
		swrm->reg_irq(swrm->handle, swr_mstr_interrupt,
		swrm, SWR_IRQ_FREE);
		} else if (swrm->irq) {
		if (irq_get_irq_data(swrm->irq) != NULL)
		irqd_set_trigger_type(
		irq_get_irq_data(swrm->irq),
		IRQ_TYPE_NONE);
		@@ -2773,6 +2774,7 @@ static int swrm_remove(struct platform_device *pdev)
		swrm->reg_irq(swrm->handle, swr_mstr_interrupt,
		swrm, SWR_IRQ_FREE);
		} else if (swrm->irq) {
		if (irq_get_irq_data(swrm->irq) != NULL)
		irqd_set_trigger_type(
		irq_get_irq_data(swrm->irq),
		IRQ_TYPE_NONE);