1 files changed, 20 insertions, 26 deletions

diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index fee869bcc959..89d6e9c35140 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -18,10 +18,10 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/mutex.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
-#include <sound/driver.h>
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <sound/core.h>
@@ -76,8 +76,10 @@ struct snd_at73c213 {
         u8                              spi_rbuffer[2];
         /* Image of the SPI registers in AT73C213. */
         u8                              reg_image[18];
-        /* Protect registers against concurrent access. */
+        /* Protect SSC registers against concurrent access. */
         spinlock_t                      lock;
+        /* Protect mixer registers against concurrent access. */
+        struct mutex                    mixer_lock;
 };
 
 #define get_chip(card) ((struct snd_at73c213 *)card->private_data)
@@ -398,7 +400,7 @@ static int snd_at73c213_mono_get(struct snd_kcontrol *kcontrol,
         int mask = (kcontrol->private_value >> 16) & 0xff;
         int invert = (kcontrol->private_value >> 24) & 0xff;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         ucontrol->value.integer.value[0] =
                 (chip->reg_image[reg] >> shift) & mask;
@@ -407,7 +409,7 @@ static int snd_at73c213_mono_get(struct snd_kcontrol *kcontrol,
                 ucontrol->value.integer.value[0] =
                         mask - ucontrol->value.integer.value[0];
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         return 0;
 }
@@ -428,13 +430,13 @@ static int snd_at73c213_mono_put(struct snd_kcontrol *kcontrol,
                 val = mask - val;
         val <<= shift;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         val = (chip->reg_image[reg] & ~(mask << shift)) | val;
         change = val != chip->reg_image[reg];
         retval = snd_at73c213_write_reg(chip, reg, val);
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         if (retval)
                 return retval;
@@ -470,7 +472,7 @@ static int snd_at73c213_stereo_get(struct snd_kcontrol *kcontrol,
         int mask = (kcontrol->private_value >> 24) & 0xff;
         int invert = (kcontrol->private_value >> 22) & 1;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         ucontrol->value.integer.value[0] =
                 (chip->reg_image[left_reg] >> shift_left) & mask;
@@ -484,7 +486,7 @@ static int snd_at73c213_stereo_get(struct snd_kcontrol *kcontrol,
                         mask - ucontrol->value.integer.value[1];
         }
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         return 0;
 }
@@ -511,7 +513,7 @@ static int snd_at73c213_stereo_put(struct snd_kcontrol *kcontrol,
         val1 <<= shift_left;
         val2 <<= shift_right;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         val1 = (chip->reg_image[left_reg] & ~(mask << shift_left)) | val1;
         val2 = (chip->reg_image[right_reg] & ~(mask << shift_right)) | val2;
@@ -519,16 +521,16 @@ static int snd_at73c213_stereo_put(struct snd_kcontrol *kcontrol,
                 || val2 != chip->reg_image[right_reg];
         retval = snd_at73c213_write_reg(chip, left_reg, val1);
         if (retval) {
-                spin_unlock_irq(&chip->lock);
+                mutex_unlock(&chip->mixer_lock);
                 goto out;
         }
         retval = snd_at73c213_write_reg(chip, right_reg, val2);
         if (retval) {
-                spin_unlock_irq(&chip->lock);
+                mutex_unlock(&chip->mixer_lock);
                 goto out;
         }
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         return change;
 
@@ -536,16 +538,7 @@ out:
         return retval;
 }
 
-static int snd_at73c213_mono_switch_info(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-
-        return 0;
-}
+#define snd_at73c213_mono_switch_info   snd_ctl_boolean_mono_info
 
 static int snd_at73c213_mono_switch_get(struct snd_kcontrol *kcontrol,
                                  struct snd_ctl_elem_value *ucontrol)
@@ -555,7 +548,7 @@ static int snd_at73c213_mono_switch_get(struct snd_kcontrol *kcontrol,
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int invert = (kcontrol->private_value >> 24) & 0xff;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         ucontrol->value.integer.value[0] =
                 (chip->reg_image[reg] >> shift) & 0x01;
@@ -564,7 +557,7 @@ static int snd_at73c213_mono_switch_get(struct snd_kcontrol *kcontrol,
                 ucontrol->value.integer.value[0] =
                         0x01 - ucontrol->value.integer.value[0];
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         return 0;
 }
@@ -589,14 +582,14 @@ static int snd_at73c213_mono_switch_put(struct snd_kcontrol *kcontrol,
                 val = mask - val;
         val <<= shift;
 
-        spin_lock_irq(&chip->lock);
+        mutex_lock(&chip->mixer_lock);
 
         val |= (chip->reg_image[reg] & ~(mask << shift));
         change = val != chip->reg_image[reg];
 
         retval = snd_at73c213_write_reg(chip, reg, val);
 
-        spin_unlock_irq(&chip->lock);
+        mutex_unlock(&chip->mixer_lock);
 
         if (retval)
                 return retval;
@@ -893,6 +886,7 @@ static int __devinit snd_at73c213_dev_init(struct snd_card *card,
                 return irq;
 
         spin_lock_init(&chip->lock);
+        mutex_init(&chip->mixer_lock);
         chip->card = card;
         chip->irq = -1;