From 117ebd09329ed8dfd9cfea6f8c8308af6a3f0cd1 Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Wed, 9 Oct 2019 17:43:20 +0800 Subject: [PATCH] soc: swr-mstr: remove soundwire state check in interrupt handler when triggering SSR during speaker playback and insert headset, headset insertion/removal IRQ don't reach soundwire master side. Remove soundwire state check in interrupt handler to resolve headset detection issue. Change-Id: If6ff9aaaab9513f713d6106913dfccbc0e75e385 Signed-off-by: Meng Wang --- soc/swr-mstr-ctrl.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c index 599644f966..7ec72de51e 100644 --- a/soc/swr-mstr-ctrl.c +++ b/soc/swr-mstr-ctrl.c @@ -1607,12 +1607,6 @@ static irqreturn_t swr_mstr_interrupt_v2(int irq, void *dev) struct swr_device *swr_dev; struct swr_master *mstr = &swrm->master; - if (!swrm->dev_up || swrm->state == SWR_MSTR_SSR) { - complete(&swrm->broadcast); - dev_dbg(swrm->dev, "%s swrm is not up\n", __func__); - return IRQ_NONE; - } - if (unlikely(swrm_lock_sleep(swrm) == false)) { dev_err(swrm->dev, "%s Failed to hold suspend\n", __func__); return IRQ_NONE;