Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8f11551b1798170dcffdd28475075ca4f1c6c990

Authored by Takashi Iwai
Committed by Jaroslav Kysela
1 parent c93d1c25be
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ALSA] Fix build error without CONFIG_HAS_DMA 

The recent change of include/asm-generic/dma-mapping-broken.h breaks
the build without CONFIG_HAS_DMA.  This patch is an ad hoc fix.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

Showing 2 changed files with 8 additions and 1 deletions Side-by-side Diff

... ... @@ -14,7 +14,8 @@
14 14 snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \
15 15 pcm_memory.o
16 16  
17   -snd-page-alloc-objs := memalloc.o sgbuf.o
  17 +snd-page-alloc-y := memalloc.o
  18 +snd-page-alloc-$(CONFIG_HAS_DMA) += sgbuf.o
18 19  
19 20 snd-rawmidi-objs := rawmidi.o
20 21 snd-timer-objs := timer.o
sound/core/memalloc.c
Diff comments   View file @ 8f11551
... ... @@ -206,6 +206,7 @@
206 206 *
207 207 */
208 208  
  209 +#ifdef CONFIG_HAS_DMA
209 210 /* allocate the coherent DMA pages */
210 211 static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma)
211 212 {
... ... @@ -239,6 +240,7 @@
239 240 dec_snd_pages(pg);
240 241 dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
241 242 }
  243 +#endif /* CONFIG_HAS_DMA */
242 244  
243 245 #ifdef CONFIG_SBUS
244 246  
245 247  
... ... @@ -312,12 +314,14 @@
312 314 dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
313 315 break;
314 316 #endif
  317 +#ifdef CONFIG_HAS_DMA
315 318 case SNDRV_DMA_TYPE_DEV:
316 319 dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
317 320 break;
318 321 case SNDRV_DMA_TYPE_DEV_SG:
319 322 snd_malloc_sgbuf_pages(device, size, dmab, NULL);
320 323 break;
  324 +#endif
321 325 default:
322 326 printk(KERN_ERR "snd-malloc: invalid device type %d\n", type);
323 327 dmab->area = NULL;
324 328  
... ... @@ -383,12 +387,14 @@
383 387 snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
384 388 break;
385 389 #endif
  390 +#ifdef CONFIG_HAS_DMA
386 391 case SNDRV_DMA_TYPE_DEV:
387 392 snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
388 393 break;
389 394 case SNDRV_DMA_TYPE_DEV_SG:
390 395 snd_free_sgbuf_pages(dmab);
391 396 break;
  397 +#endif
392 398 default:
393 399 printk(KERN_ERR "snd-malloc: invalid device type %d\n", dmab->dev.type);
394 400 }