All of lore.kernel.org
 help / color / mirror / Atom feed
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: myungjoo.ham@samsung.com, cw00.choi@samsung.com,
	dmitry.torokhov@gmail.com, lgirdwood@gmail.com, lars@metafoo.de,
	peter.ujfalusi@ti.com, jarkko.nikula@bitmer.com,
	eric.y.miao@gmail.com, haojian.zhuang@gmail.com,
	linux-kernel@vger.kernel.org,
	patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org,
	linux@arm.linux.org.uk
Subject: [PATCH 01/15] Input - arizona-haptics: Fix double lock of dapm_mutex
Date: Mon, 17 Feb 2014 16:51:29 +0000	[thread overview]
Message-ID: <1392655903-24537-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1392655903-24537-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>

snd_soc_dapm_sync takes the dapm_mutex internally, but we currently take
it externally as well. This patch fixes this.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/input/misc/arizona-haptics.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 7a04f54..e7e12a5 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -77,16 +77,14 @@ static void arizona_haptics_work(struct work_struct *work)
 			return;
 		}
 
+		mutex_unlock(dapm_mutex);
+
 		ret = snd_soc_dapm_sync(arizona->dapm);
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
 				ret);
-			mutex_unlock(dapm_mutex);
 			return;
 		}
-
-		mutex_unlock(dapm_mutex);
-
 	} else {
 		/* This disable sequence will be a noop if already enabled */
 		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
@@ -99,16 +97,15 @@ static void arizona_haptics_work(struct work_struct *work)
 			return;
 		}
 
+		mutex_unlock(dapm_mutex);
+
 		ret = snd_soc_dapm_sync(arizona->dapm);
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
 				ret);
-			mutex_unlock(dapm_mutex);
 			return;
 		}
 
-		mutex_unlock(dapm_mutex);
-
 		ret = regmap_update_bits(arizona->regmap,
 					 ARIZONA_HAPTICS_CONTROL_1,
 					 ARIZONA_HAP_CTRL_MASK,
-- 
1.7.2.5


WARNING: multiple messages have this Message-ID (diff)
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
To: broonie@kernel.org
Cc: alsa-devel@alsa-project.org, lars@metafoo.de,
	eric.y.miao@gmail.com, dmitry.torokhov@gmail.com,
	lgirdwood@gmail.com, haojian.zhuang@gmail.com,
	linux-kernel@vger.kernel.org, peter.ujfalusi@ti.com,
	cw00.choi@samsung.com, myungjoo.ham@samsung.com,
	patches@opensource.wolfsonmicro.com, linux@arm.linux.org.uk,
	jarkko.nikula@bitmer.com
Subject: [PATCH 01/15] Input - arizona-haptics: Fix double lock of dapm_mutex
Date: Mon, 17 Feb 2014 16:51:29 +0000	[thread overview]
Message-ID: <1392655903-24537-2-git-send-email-ckeepax@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1392655903-24537-1-git-send-email-ckeepax@opensource.wolfsonmicro.com>

snd_soc_dapm_sync takes the dapm_mutex internally, but we currently take
it externally as well. This patch fixes this.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/input/misc/arizona-haptics.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 7a04f54..e7e12a5 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -77,16 +77,14 @@ static void arizona_haptics_work(struct work_struct *work)
 			return;
 		}
 
+		mutex_unlock(dapm_mutex);
+
 		ret = snd_soc_dapm_sync(arizona->dapm);
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
 				ret);
-			mutex_unlock(dapm_mutex);
 			return;
 		}
-
-		mutex_unlock(dapm_mutex);
-
 	} else {
 		/* This disable sequence will be a noop if already enabled */
 		mutex_lock_nested(dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
@@ -99,16 +97,15 @@ static void arizona_haptics_work(struct work_struct *work)
 			return;
 		}
 
+		mutex_unlock(dapm_mutex);
+
 		ret = snd_soc_dapm_sync(arizona->dapm);
 		if (ret != 0) {
 			dev_err(arizona->dev, "Failed to sync DAPM: %d\n",
 				ret);
-			mutex_unlock(dapm_mutex);
 			return;
 		}
 
-		mutex_unlock(dapm_mutex);
-
 		ret = regmap_update_bits(arizona->regmap,
 					 ARIZONA_HAPTICS_CONTROL_1,
 					 ARIZONA_HAP_CTRL_MASK,
-- 
1.7.2.5

  reply	other threads:[~2014-02-17 17:00 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-17 16:51 [PATCH 00/15] Update locking for snd_soc_dapm_xxxx_pin functions Charles Keepax
2014-02-17 16:51 ` Charles Keepax
2014-02-17 16:51 ` Charles Keepax [this message]
2014-02-17 16:51   ` [PATCH 01/15] Input - arizona-haptics: Fix double lock of dapm_mutex Charles Keepax
2014-02-17 19:20   ` Dmitry Torokhov
2014-02-18  0:28     ` Mark Brown
2014-02-18 14:53     ` [alsa-devel] " Charles Keepax
2014-02-17 16:51 ` [PATCH 02/15] ASoC: dapm: Add locked version of snd_soc_dapm_xxxx_pin functions Charles Keepax
2014-02-17 16:51   ` Charles Keepax
2014-02-17 17:06   ` Lars-Peter Clausen
2014-02-18  0:30     ` Mark Brown
2014-02-18  9:04       ` [alsa-devel] " Charles Keepax
2014-02-18  9:04         ` Charles Keepax
2014-02-17 16:51 ` [PATCH 03/15] ASoC: adav80x: Update locking around use of DAPM pin API Charles Keepax
2014-02-17 16:51   ` Charles Keepax
2014-02-18  0:33   ` Mark Brown
2014-02-17 16:51 ` [PATCH 04/15] ASoC: wm5100: " Charles Keepax
2014-02-18  0:47   ` Mark Brown
2014-02-18  9:24     ` [alsa-devel] " Charles Keepax
2014-02-17 16:51 ` [PATCH 05/15] ASoC: wm8962: " Charles Keepax
2014-02-17 16:51   ` Charles Keepax
2014-02-17 16:51 ` [PATCH 06/15] ASoC: wm8994: " Charles Keepax
2014-02-17 16:51 ` [PATCH 07/15] ASoC: wm8996: " Charles Keepax
2014-02-17 16:51 ` [PATCH 08/15] ASoC: mfld_machine: " Charles Keepax
2014-02-17 16:51 ` [PATCH 09/15] ASoC: ams-delta: " Charles Keepax
2014-02-17 16:51 ` [PATCH 10/15] ASoC: omap: n810: " Charles Keepax
2014-02-17 16:51 ` [PATCH 11/15] ASoC: omap: rx51: " Charles Keepax
2014-02-17 16:51 ` [PATCH 12/15] ASoC: pxa: corgi: " Charles Keepax
2014-02-17 16:51 ` [PATCH 13/15] ASoC: pxa: magician: " Charles Keepax
2014-02-17 16:51 ` [PATCH 14/15] ASoC: pxa: spitz: " Charles Keepax
2014-02-17 16:51 ` [PATCH 15/15] ASoC: pxa: tosa: " Charles Keepax

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392655903-24537-2-git-send-email-ckeepax@opensource.wolfsonmicro.com \
    --to=ckeepax@opensource.wolfsonmicro.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=cw00.choi@samsung.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=eric.y.miao@gmail.com \
    --cc=haojian.zhuang@gmail.com \
    --cc=jarkko.nikula@bitmer.com \
    --cc=lars@metafoo.de \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=myungjoo.ham@samsung.com \
    --cc=patches@opensource.wolfsonmicro.com \
    --cc=peter.ujfalusi@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.