openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: ak411x: Fix race of reinit() calls 

Protect the call with a mutex, as this may be called in parallel
(either from the PCM rate change and the clock change).

Acked-by: Jaroslav Kysela <perex@perex.cz>
Tested-by: Pavel Hofman <pavel.hofman@ivitera.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-16 13:03:28 +01:00
parent 1293617cdd
commit 1781e78c63
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/ak4113.h
View File

@ -287,6 +287,7 @@ struct ak4113 {
ak4113_read_t *read; ak4113_read_t *read;
void *private_data; void *private_data;
atomic_t wq_processing; atomic_t wq_processing;
struct mutex reinit_mutex;
spinlock_t lock; spinlock_t lock;
unsigned char regmap[AK4113_WRITABLE_REGS]; unsigned char regmap[AK4113_WRITABLE_REGS];
struct snd_kcontrol *kctls[AK4113_CONTROLS]; struct snd_kcontrol *kctls[AK4113_CONTROLS];

1
include/sound/ak4114.h
View File

@ -169,6 +169,7 @@ struct ak4114 {
ak4114_read_t * read; ak4114_read_t * read;
void * private_data; void * private_data;
atomic_t wq_processing; atomic_t wq_processing;
struct mutex reinit_mutex;
spinlock_t lock; spinlock_t lock;
unsigned char regmap[6]; unsigned char regmap[6];
unsigned char txcsb[5]; unsigned char txcsb[5];

3
sound/i2c/other/ak4113.c
View File

@ -89,6 +89,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
chip->private_data = private_data; chip->private_data = private_data;
INIT_DELAYED_WORK(&chip->work, ak4113_stats); INIT_DELAYED_WORK(&chip->work, ak4113_stats);
atomic_set(&chip->wq_processing, 0); atomic_set(&chip->wq_processing, 0);
mutex_init(&chip->reinit_mutex);
for (reg = 0; reg < AK4113_WRITABLE_REGS ; reg++) for (reg = 0; reg < AK4113_WRITABLE_REGS ; reg++)
chip->regmap[reg] = pgm[reg]; chip->regmap[reg] = pgm[reg];
@ -141,7 +142,9 @@ void snd_ak4113_reinit(struct ak4113 *chip)
{ {
if (atomic_inc_return(&chip->wq_processing) == 1) if (atomic_inc_return(&chip->wq_processing) == 1)
cancel_delayed_work_sync(&chip->work); cancel_delayed_work_sync(&chip->work);
mutex_lock(&chip->reinit_mutex);
ak4113_init_regs(chip); ak4113_init_regs(chip);
mutex_unlock(&chip->reinit_mutex);
/* bring up statistics / event queing */ /* bring up statistics / event queing */
if (atomic_dec_and_test(&chip->wq_processing)) if (atomic_dec_and_test(&chip->wq_processing))
schedule_delayed_work(&chip->work, HZ / 10); schedule_delayed_work(&chip->work, HZ / 10);

3
sound/i2c/other/ak4114.c
View File

@ -100,6 +100,7 @@ int snd_ak4114_create(struct snd_card *card,
chip->private_data = private_data; chip->private_data = private_data;
INIT_DELAYED_WORK(&chip->work, ak4114_stats); INIT_DELAYED_WORK(&chip->work, ak4114_stats);
atomic_set(&chip->wq_processing, 0); atomic_set(&chip->wq_processing, 0);
mutex_init(&chip->reinit_mutex);
for (reg = 0; reg < 6; reg++) for (reg = 0; reg < 6; reg++)
chip->regmap[reg] = pgm[reg]; chip->regmap[reg] = pgm[reg];
@ -156,7 +157,9 @@ void snd_ak4114_reinit(struct ak4114 *chip)
{ {
if (atomic_inc_return(&chip->wq_processing) == 1) if (atomic_inc_return(&chip->wq_processing) == 1)
cancel_delayed_work_sync(&chip->work); cancel_delayed_work_sync(&chip->work);
mutex_lock(&chip->reinit_mutex);
ak4114_init_regs(chip); ak4114_init_regs(chip);
mutex_unlock(&chip->reinit_mutex);
/* bring up statistics / event queing */ /* bring up statistics / event queing */
if (atomic_dec_and_test(&chip->wq_processing)) if (atomic_dec_and_test(&chip->wq_processing))
schedule_delayed_work(&chip->work, HZ / 10); schedule_delayed_work(&chip->work, HZ / 10);