ALSA: ak411x: Fix race of reinit() calls

[sfrench/cifs-2.6.git] / sound / i2c / other / ak4113.c

diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index c2b14d981fa1fb0dc3634688045148a8eaf07885..88844881cbff99179eb68f6aff288598945d07c7 100644 (file)
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -89,6 +89,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
        chip->private_data = private_data;
        INIT_DELAYED_WORK(&chip->work, ak4113_stats);
        atomic_set(&chip->wq_processing, 0);
+       mutex_init(&chip->reinit_mutex);
 
        for (reg = 0; reg < AK4113_WRITABLE_REGS ; 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)
                cancel_delayed_work_sync(&chip->work);
+       mutex_lock(&chip->reinit_mutex);
        ak4113_init_regs(chip);
+       mutex_unlock(&chip->reinit_mutex);
        /* bring up statistics / event queing */
        if (atomic_dec_and_test(&chip->wq_processing))
                schedule_delayed_work(&chip->work, HZ / 10);