Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef82f598 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c2a98384 5607dddb

sound/core/oss/pcm_oss.c

+2 −2
Original line number Diff line number Diff line
@@ -1326,7 +1326,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha 
static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const char __user *buf, size_t bytes)

{

	size_t xfer = 0;

	ssize_t tmp;

	ssize_t tmp = 0;

	struct snd_pcm_runtime *runtime = substream->runtime;



	if (atomic_read(&substream->mmap_count))
@@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf, 
static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __user *buf, size_t bytes)

{

	size_t xfer = 0;

	ssize_t tmp;

	ssize_t tmp = 0;

	struct snd_pcm_runtime *runtime = substream->runtime;



	if (atomic_read(&substream->mmap_count))

sound/core/pcm_native.c

+1 −1
Original line number Diff line number Diff line
@@ -3422,7 +3422,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, 
					 area,

					 substream->runtime->dma_area,

					 substream->runtime->dma_addr,

					 area->vm_end - area->vm_start);

					 substream->runtime->dma_bytes);

#endif /* CONFIG_X86 */

	/* mmap with fault handler */

	area->vm_ops = &snd_pcm_vm_ops_data_fault;

sound/usb/quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -1171,6 +1171,7 @@ static bool is_teac_dsd_dac(unsigned int id) 
	switch (id) {

	case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */

	case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */

	case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */

		return true;

	}

	return false;