[GIT PULL] sound fixes for 4.16-final

[GIT PULL] sound fixes for 4.16-final

[Takashi Iwai]

Linus,

please pull sound fixes for v4.16-final from:

  git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.16

The topmost commit is 5607dddbfca774fb38bffadcb077fe03aa4ac5c6

----------------------------------------------------------------

sound fixes for 4.16-final

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.

----------------------------------------------------------------

Dan Carpenter (1):
      ALSA: pcm: potential uninitialized return values

Nobutaka Okabe (1):
      ALSA: usb-audio: Add native DSD support for TEAC UD-301

Stefan Roese (1):
      ALSA: pcm: Use dma_bytes as size parameter in dma_mmap_coherent()

---
 sound/core/oss/pcm_oss.c | 4 ++--
 sound/core/pcm_native.c  | 2 +-
 sound/usb/quirks.c       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 02298c9c6020..441405081195 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -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))
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,
 					 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;
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index ea8f3de92fa4..794224e1d6df 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -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;

Re: [GIT PULL] sound fixes for 4.16-final

[Linus Torvalds]

On Thu, Mar 29, 2018 at 4:23 AM, Takashi Iwai <tiwai@suse.de> wrote:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.16

No such tag. Forgot to push?

There's the "for-linus" branch that matches the commit id you stated,
but no tags that point to it..

Hmm?

          Linus

Re: [GIT PULL] sound fixes for 4.16-final

[Takashi Iwai]

On Fri, 30 Mar 2018 07:21:15 +0200,
Linus Torvalds wrote:
> 
> On Thu, Mar 29, 2018 at 4:23 AM, Takashi Iwai <tiwai@suse.de> wrote:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-4.16
> 
> No such tag. Forgot to push?
> 
> There's the "for-linus" branch that matches the commit id you stated,
> but no tags that point to it..
> 
> Hmm?

Damn, sorry, I pushed to github mirror, but somehow it didn't go out
to kernel.org.

Now pushed out.


Takashi