Changeset 92 for GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c

Timestamp:

May 2, 2007, 9:13:43 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged 0.9.0beta6 to 0.9.0beta12. Fixed a few compilation errors.
Left include/sound/driver.h at beta9 until I figure out why it contains
so many modifications to sections that were removed in beta10.
Does not yet build. Needs more fixing.
Added a few new files that were in the copy Paul gave me to work from.

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/es1968.c (modified) (5 diffs)

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

@@ -1606 +1606 @@
     es->substream = substream;
     es->mode = ESM_MODE_PLAY;
+        INIT_LIST_HEAD(&es->list);
 
     runtime->private_data = es;
@@ -1657 +1658 @@
     es->substream = substream;
     es->mode = ESM_MODE_CAPTURE;
+        INIT_LIST_HEAD(&es->list);
 
     /* get mixbuffer */
@@ -1717 +1719 @@
     return 0;
 }
+
 static snd_pcm_ops_t snd_es1968_playback_ops = {
     /*  open:     */    snd_es1968_playback_open,
@@ -2005 +2008 @@
 
     if (event & ESM_SOUND_IRQ) {
-        struct list_head *p;
+                struct list_head *p, *n;
         spin_lock(&chip->substream_lock);
-        list_for_each(p, &chip->substream_list) {
+                /* we need to use list_for_each_safe here since the substream
+                 * can be deleted in period_elapsed().
+                 */
+                list_for_each_safe(p, n, &chip->substream_list) {
             esschan_t *es = list_entry(p, esschan_t, list);
             if (es->running)
@@ -2841 +2847 @@
     if ((err = pci_module_init(&driver)) < 0) {
 #ifdef MODULE
-        //              snd_printk("ESS Maestro soundcard not found or device busy\n");
+//              snd_printk(KERN_ERR "ESS Maestro soundcard not found or device busy\n");
 #endif
         return err;