Changeset 206 for GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

Timestamp:

Jun 17, 2007, 1:16:58 AM (18 years ago)

Author:

Brendan Oakley

Message:

Applied fixes from trunk to ReSync branch, fixed up additional conflicts, errors, and warnings.

File:

• GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c (modified) (4 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

@@ -234 +234 @@
     bps *= snd_pcm_format_width(runtime->format);
     bps /= 8;
-    if (bps <= 0)
+    if (bps == 0)
         return -EINVAL;
     dpcm->pcm_bps = bps;
@@ -338 +338 @@
     if (dpcm == NULL)
         return -ENOMEM;
-    if ((runtime->dma_area = snd_malloc_pages_fallback(MAX_BUFFER_SIZE, GFP_KERNEL, &runtime->dma_bytes)) == NULL) {
+    if ((runtime->dma_area = snd_malloc_pages_fallback(MAX_BUFFER_SIZE, GFP_KERNEL, (unsigned long *) &runtime->dma_bytes)) == NULL) {
         kfree(dpcm);
         return -ENOMEM;
@@ -367 +367 @@
     if (dpcm == NULL)
         return -ENOMEM;
-    if ((runtime->dma_area = snd_malloc_pages_fallback(MAX_BUFFER_SIZE, GFP_KERNEL, &runtime->dma_bytes)) == NULL) {
+    if ((runtime->dma_area = snd_malloc_pages_fallback(MAX_BUFFER_SIZE, GFP_KERNEL, (unsigned long *) &runtime->dma_bytes)) == NULL) {
         kfree(dpcm);
         return -ENOMEM;
@@ -445 +445 @@
     0, 0, snd_dummy_volume_info, \
     snd_dummy_volume_get, snd_dummy_volume_put, \
+    0, \
     addr }