Changeset 348 for GPL/branches/alsa-resync1/alsa-kernel/pci/rme96.c

Timestamp:

Apr 21, 2008, 2:52:19 AM (17 years ago)

Author:

Brendan Oakley

Message:

alsa-resync1 branch merged to ALSA 1.0.4

File:

• GPL/branches/alsa-resync1/alsa-kernel/pci/rme96.c (modified) (2 diffs)

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

@@ -1719 +1719 @@
         rme96->spdif_pcm->info_flags = 0;
 
-        snd_pcm_lib_preallocate_pages_for_all(rme96->spdif_pcm, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE, GFP_KERNEL);
+        snd_pcm_lib_preallocate_pages_for_all(rme96->spdif_pcm,
+                                              SNDRV_DMA_TYPE_CONTINUOUS,
+                                              snd_dma_continuous_data(GFP_KERNEL),
+                                              RME96_BUFFER_SIZE,
+                                              RME96_BUFFER_SIZE);
 
         /* set up ALSA pcm device for ADAT */
@@ -1739 +1743 @@
                 rme96->adat_pcm->info_flags = 0;
 
-                snd_pcm_lib_preallocate_pages_for_all(rme96->adat_pcm, RME96_BUFFER_SIZE, RME96_BUFFER_SIZE, GFP_KERNEL);
+                snd_pcm_lib_preallocate_pages_for_all(rme96->adat_pcm,
+                                                      SNDRV_DMA_TYPE_CONTINUOUS,
+                                                      snd_dma_continuous_data(GFP_KERNEL),
+                                                      RME96_BUFFER_SIZE,
+                                                      RME96_BUFFER_SIZE);
         }