Changeset 612 for GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/atiixp.c

Timestamp:

May 16, 2020, 10:05:07 AM (5 years ago)

Author:

Paul Smedley

Message:

Commit 3..102 changes from trunk

File:

• GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/atiixp.c (modified) (11 diffs)

GPL/branches/uniaud32-linux-3.2.102/alsa-kernel/pci/atiixp.c

@@ -26 +26 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
 #include <sound/core.h>
@@ -34 +34 @@
 #include <sound/ac97_codec.h>
 #include <sound/initval.h>
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "atiixp"
+#endif
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
@@ -352 +356 @@
  * a static RING of buffer descriptors is used.
  *
- * the ring is built in this function, and is set up to the hardware.
+ * the ring is built in this function, and is set up to the hardware. 
  */
 static int atiixp_build_dma_packets(struct atiixp *chip, struct atiixp_dma *dma,
@@ -476 +480 @@
 {
         unsigned int data;
-
+    
         if (snd_atiixp_acquire_codec(chip) < 0)
                 return;
@@ -491 +495 @@
         struct atiixp *chip = ac97->private_data;
         return snd_atiixp_codec_read(chip, ac97->num, reg);
-
+    
 }
 
@@ -518 +522 @@
         udelay(10);
         atiixp_update(chip, CMD, ATI_REG_CMD_AC_SOFT_RESET, 0);
-
+    
         timeout = 10;
         while (! (atiixp_read(chip, CMD) & ATI_REG_CMD_ACLINK_ACTIVE)) {
@@ -527 +531 @@
                 mdelay(1);
                 atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
-                if (--timeout) {
+                if (!--timeout) {
                         snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
                         break;
@@ -696 +700 @@
                 return;
         snd_printdd("atiixp: XRUN detected (DMA %d)\n", dma->ops->type);
+        snd_pcm_stream_lock(dma->substream);
         snd_pcm_stop(dma->substream, SNDRV_PCM_STATE_XRUN);
+        snd_pcm_stream_unlock(dma->substream);
 }
 
@@ -939 +945 @@
         atiixp_update(chip, 6CH_REORDER, ATI_REG_6CH_REORDER_EN,
                       substream->runtime->channels >= 6 ? ATI_REG_6CH_REORDER_EN: 0);
-
+    
         spin_unlock_irq(&chip->reg_lock);
         return 0;
@@ -1632 +1638 @@
 
         if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
-                        card->shortname, chip)) {
+                        KBUILD_MODNAME, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_atiixp_free(chip);
@@ -1713 +1719 @@
 
 static struct pci_driver driver = {
-        .name = "ATI IXP AC97 controller",
+        .name = KBUILD_MODNAME,
         .id_table = snd_atiixp_ids,
         .probe = snd_atiixp_probe,