Changeset 231 for GPL/branches/alsa-resync1/alsa-kernel/pci

Timestamp:

Aug 5, 2007, 7:09:24 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged to Alsa 0.9.2

Location:

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712

Files:

• ice1712.c (modified) (5 diffs)
• ice1724.c (modified) (3 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1712.c

@@ -1814 +1814 @@
 }
 
-static snd_kcontrol_new_t snd_ice1712_pro_internal_clock = __devinitdata {
+static snd_kcontrol_new_t snd_ice1712_pro_internal_clock __devinitdata = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "Multi Track Internal Clock",
@@ -1833 +1833 @@
 static int snd_ice1712_pro_rate_locking_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED;
         return 0;
 }
@@ -1839 +1839 @@
 static int snd_ice1712_pro_rate_locking_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_LOCKED = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_LOCKED != nval;
+        PRO_RATE_LOCKED = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }
@@ -1865 +1869 @@
 static int snd_ice1712_pro_rate_reset_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_RESET ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_RESET;
         return 0;
 }
@@ -1871 +1875 @@
 static int snd_ice1712_pro_rate_reset_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_RESET = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_RESET != nval;
+        PRO_RATE_RESET = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }

GPL/branches/alsa-resync1/alsa-kernel/pci/ice1712/ice1724.c

@@ -1314 +1314 @@
 static int snd_vt1724_pro_rate_locking_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED ? 1 : 0;
+        ucontrol->value.integer.value[0] = PRO_RATE_LOCKED;
         return 0;
 }
@@ -1320 +1320 @@
 static int snd_vt1724_pro_rate_locking_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_LOCKED = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_LOCKED != nval;
+        PRO_RATE_LOCKED = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }
@@ -1352 +1356 @@
 static int snd_vt1724_pro_rate_reset_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-        int change = 0;
-
-        change = PRO_RATE_LOCKED ? 1 : 0 != ucontrol->value.integer.value[0] ? 1 : 0;
-        PRO_RATE_RESET = ucontrol->value.integer.value[0] ? 1 : 0;
+        ice1712_t *ice = snd_kcontrol_chip(kcontrol);
+        int change = 0, nval;
+
+        nval = ucontrol->value.integer.value[0] ? 1 : 0;
+        spin_lock_irq(&ice->reg_lock);
+        change = PRO_RATE_RESET != nval;
+        PRO_RATE_RESET = nval;
+        spin_unlock_irq(&ice->reg_lock);
         return change;
 }