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

Commit dd29f284 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: swr-mstr: Fix KW issue in swrm_remove"

parents 668ef31d 269c76b3

soc/swr-mstr-ctrl.c

+6 −6
Original line number Diff line number Diff line
@@ -2734,13 +2734,13 @@ static int swrm_probe(struct platform_device *pdev) 
		swrm->reg_irq(swrm->handle, swr_mstr_interrupt,

				swrm, SWR_IRQ_FREE);

	} else if (swrm->irq) {

		free_irq(swrm->irq, swrm);

		irqd_set_trigger_type(

			irq_get_irq_data(swrm->irq),

			IRQ_TYPE_NONE);

	}

		if (swrm->swr_irq_wakeup_capable)

			irq_set_irq_wake(swrm->irq, 0);

		free_irq(swrm->irq, swrm);

	}

err_irq_fail:

	mutex_destroy(&swrm->irq_lock);

	mutex_destroy(&swrm->mlock);
@@ -2764,15 +2764,15 @@ static int swrm_remove(struct platform_device *pdev) 
		swrm->reg_irq(swrm->handle, swr_mstr_interrupt,

				swrm, SWR_IRQ_FREE);

	} else if (swrm->irq) {

		free_irq(swrm->irq, swrm);

		irqd_set_trigger_type(

			irq_get_irq_data(swrm->irq),

			IRQ_TYPE_NONE);

		if (swrm->swr_irq_wakeup_capable)

			irq_set_irq_wake(swrm->irq, 0);

		free_irq(swrm->irq, swrm);

	} else if (swrm->wake_irq > 0) {

		free_irq(swrm->wake_irq, swrm);

	}

	if (swrm->swr_irq_wakeup_capable)

		irq_set_irq_wake(swrm->irq, 0);

	cancel_work_sync(&swrm->wakeup_work);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);