Changeset 777 for GPL/trunk/alsa-kernel/pci/emu10k1/emumixer.c

Timestamp:

Apr 21, 2025, 7:17:25 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge from uniaud32-exp branch

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emumixer.c (modified) (10 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emumixer.c

@@ -662 +662 @@
         if (change) {
                 emu->emu1010.output_source[channel] = val;
+                snd_emu1010_fpga_lock(emu);
                 snd_emu1010_output_source_apply(emu, channel, val);
+                snd_emu1010_fpga_unlock(emu);
         }
         return change;
@@ -706 +708 @@
         if (change) {
                 emu->emu1010.input_source[channel] = val;
+                snd_emu1010_fpga_lock(emu);
                 snd_emu1010_input_source_apply(emu, channel, val);
+                snd_emu1010_fpga_unlock(emu);
         }
         return change;
@@ -775 +779 @@
         change = (cache != emu->emu1010.adc_pads);
         if (change) {
-                snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, cache );
+                snd_emu1010_fpga_write_lock(emu, EMU_HANA_ADC_PADS, cache );
                 emu->emu1010.adc_pads = cache;
         }
@@ -833 +837 @@
         change = (cache != emu->emu1010.dac_pads);
         if (change) {
-                snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, cache );
+                snd_emu1010_fpga_write_lock(emu, EMU_HANA_DAC_PADS, cache );
                 emu->emu1010.dac_pads = cache;
         }
@@ -981 +985 @@
         if (val >= emu_ci->num)
                 return -EINVAL;
+        snd_emu1010_fpga_lock(emu);
         spin_lock_irq(&emu->reg_lock);
         change = (emu->emu1010.clock_source != val);
@@ -997 +1002 @@
                 spin_unlock_irq(&emu->reg_lock);
         }
+        snd_emu1010_fpga_unlock(emu);
         return change;
 }
@@ -1042 +1048 @@
         if (change) {
                 emu->emu1010.clock_fallback = val;
-                snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 1 - val);
+                snd_emu1010_fpga_write_lock(emu, EMU_HANA_DEFCLOCK, 1 - val);
         }
         return change;
@@ -1094 +1100 @@
                 tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |
                         (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);
-                snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
+                snd_emu1010_fpga_write_lock(emu, EMU_HANA_OPTICAL_TYPE, tmp);
         }
         return change;
@@ -1145 +1151 @@
                 tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |
                         (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);
-                snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
+                snd_emu1010_fpga_write_lock(emu, EMU_HANA_OPTICAL_TYPE, tmp);
         }
         return change;
@@ -2324 +2330 @@
                         emu->emu1010.output_source[i] =
                                 emu1010_map_source(emu_ri, emu_ri->out_dflts[i]);
+                snd_emu1010_fpga_lock(emu);
                 snd_emu1010_apply_sources(emu);
+                snd_emu1010_fpga_unlock(emu);
 
                 kctl = emu->ctl_clock_source = snd_ctl_new1(&snd_emu1010_clock_source, emu);