Changeset 717 for GPL/trunk/alsa-kernel/hda/hdac_stream.c

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/hda/hdac_stream.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/hda/hdac_stream.c

@@ -302 +302 @@
                 (substream->stream + 1);
 
+        spin_lock_irq(&bus->reg_lock);
         list_for_each_entry(azx_dev, &bus->stream_list, list, struct hdac_stream) {
                 if (azx_dev->direction != substream->stream)
@@ -315 +316 @@
         }
         if (res) {
-                spin_lock_irq(&bus->reg_lock);
                 res->opened = 1;
                 res->running = 0;
                 res->assigned_key = key;
                 res->substream = substream;
-                spin_unlock_irq(&bus->reg_lock);
-        }
+        }
+        spin_unlock_irq(&bus->reg_lock);
         return res;
 }
@@ -539 +539 @@
         cc->mask = CLOCKSOURCE_MASK(32);
 
+#ifndef TARGET_OS2
+        /*
+         * Calculate the optimal mult/shift values. The counter wraps
+         * around after ~178.9 seconds.
+         */
+        clocks_calc_mult_shift(&cc->mult, &cc->shift, 24000000,
+                               NSEC_PER_SEC, 178);
+#else
         /*
          * Converting from 24 MHz to ns means applying a 125/3 factor.
@@ -551 +559 @@
         cc->mult = 125; /* saturation after 195 years */
         cc->shift = 0;
-
+#endif
         nsec = 0; /* audio time is elapsed time since trigger */
         timecounter_init(tc, cc, nsec);