summaryrefslogtreecommitdiff
path: root/include/sound/ak4113.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-13 12:53:20 +0300
committerTakashi Iwai <tiwai@suse.de>2015-01-29 00:29:20 +0300
commit4161b4505f1690358ac0a9ee59845a7887336b21 (patch)
tree627a37684dae207307c59322d7673371d7f346a0 /include/sound/ak4113.h
parent0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff)
downloadlinux-4161b4505f1690358ac0a9ee59845a7887336b21.tar.xz
ALSA: ak411x: Fix stall in work callback
When ak4114 work calls its callback and the callback invokes ak4114_reinit(), it stalls due to flush_delayed_work(). For avoiding this, control the reentrance by introducing a refcount. Also flush_delayed_work() is replaced with cancel_delayed_work_sync(). The exactly same bug is present in ak4113.c and fixed as well. Reported-by: Pavel Hofman <pavel.hofman@ivitera.com> Acked-by: Jaroslav Kysela <perex@perex.cz> Tested-by: Pavel Hofman <pavel.hofman@ivitera.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/ak4113.h')
-rw-r--r--include/sound/ak4113.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ak4113.h b/include/sound/ak4113.h
index 2609048c1d44..3a34f6edc2d1 100644
--- a/include/sound/ak4113.h
+++ b/include/sound/ak4113.h
@@ -286,7 +286,7 @@ struct ak4113 {
ak4113_write_t *write;
ak4113_read_t *read;
void *private_data;
- unsigned int init:1;
+ atomic_t wq_processing;
spinlock_t lock;
unsigned char regmap[AK4113_WRITABLE_REGS];
struct snd_kcontrol *kctls[AK4113_CONTROLS];