Changeset 689 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Jul 24, 2021, 3:42:01 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge in changes from uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/intel8x0.c (modified) (5 diffs)

GPL/trunk/alsa-kernel/pci/intel8x0.c

@@ -358 +358 @@
         struct ac97_pcm *pcm;
         int pcm_open_flag;
+        unsigned int prepared:1;
         unsigned int suspended: 1;
 };
@@ -717 +718 @@
         int status, civ, i, step;
         int ack = 0;
+
+        if (!(ichdev->prepared || chip->in_measurement) || ichdev->suspended)
+                return;
 
         spin_lock_irqsave(&chip->reg_lock, flags);
@@ -908 +912 @@
                 snd_ac97_pcm_close(ichdev->pcm);
                 ichdev->pcm_open_flag = 0;
+                ichdev->prepared = 0;
         }
         err = snd_ac97_pcm_open(ichdev->pcm, params_rate(hw_params),
@@ -929 +934 @@
                 snd_ac97_pcm_close(ichdev->pcm);
                 ichdev->pcm_open_flag = 0;
+                ichdev->prepared = 0;
         }
         return 0;
@@ -1003 +1009 @@
         }
         snd_intel8x0_setup_periods(chip, ichdev);
+        ichdev->prepared = 1;
         return 0;
 }