diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-30 13:11:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-30 13:11:14 -0400 |
commit | ef82f598a01b497dd243ba20f704e29efffacb09 (patch) | |
tree | 7d7f82f7879a56d04dff1e5ead056811e53306d1 /sound/core/pcm_native.c | |
parent | c2a9838452a4d71f76103c18c926468a9ea05713 (diff) | |
parent | 5607dddbfca774fb38bffadcb077fe03aa4ac5c6 (diff) |
Merge tag 'sound-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Very small fixes (all one-liners) at this time.
One fix is for a PCM core stuff to correct the mmap behavior on
non-x86. It doesn't show on most machines but mostly only for exotic
non-interleaved formats"
* tag 'sound-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: pcm: potential uninitialized return values
ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent()
ALSA: usb-audio: Add native DSD support for TEAC UD-301
Diffstat (limited to 'sound/core/pcm_native.c')
-rw-r--r-- | sound/core/pcm_native.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 77ba50ddcf9e..d18b3982548b 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c | |||
@@ -3422,7 +3422,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, | |||
3422 | area, | 3422 | area, |
3423 | substream->runtime->dma_area, | 3423 | substream->runtime->dma_area, |
3424 | substream->runtime->dma_addr, | 3424 | substream->runtime->dma_addr, |
3425 | area->vm_end - area->vm_start); | 3425 | substream->runtime->dma_bytes); |
3426 | #endif /* CONFIG_X86 */ | 3426 | #endif /* CONFIG_X86 */ |
3427 | /* mmap with fault handler */ | 3427 | /* mmap with fault handler */ |
3428 | area->vm_ops = &snd_pcm_vm_ops_data_fault; | 3428 | area->vm_ops = &snd_pcm_vm_ops_data_fault; |