From a151ba4e135621c2a35aaa2824ddaa6fb6e685c6 Mon Sep 17 00:00:00 2001 From: Sudheer Papothi Date: Wed, 27 May 2020 13:17:17 +0530 Subject: [PATCH] ASoC: swr-haptics: Avoid soundwire resume during subsystem restart Soundwire register write from haptics resumes soundwire master during subsystem down. Avoid soundwire slave register writes when the subsystem is already down. Change-Id: I78304b84bfaf882df1b76dbd04a8e063185d3963 Signed-off-by: Sudheer Papothi --- asoc/codecs/swr-haptics.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/asoc/codecs/swr-haptics.c b/asoc/codecs/swr-haptics.c index 4cc8cd8f88..b4d3b17bc5 100644 --- a/asoc/codecs/swr-haptics.c +++ b/asoc/codecs/swr-haptics.c @@ -431,22 +431,12 @@ static int swr_haptics_device_down(struct swr_device *sdev) { struct swr_haptics_dev *swr_hap = swr_get_dev_data(sdev); int rc; - unsigned int val; if (!swr_hap) { dev_err(&sdev->dev, "%s: no data for swr_hap\n", __func__); return -ENODEV; } - /* Stop SWR play in SSR */ - val = 0; - rc = regmap_write(swr_hap->regmap, SWR_PLAY_REG, val); - if (rc) { - dev_err(swr_hap->dev, "%s: disable SWR_PLAY failed, rc=%d\n", - __func__, rc); - return rc; - } - /* Put SWR slave into reset */ rc = regulator_disable(swr_hap->vdd); if (rc < 0) {