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

Linus Torvalds committed 8 years ago

Commit ef82f592 parents c2a9838 5607ddd3 files · +4 −3Browse files

Unified · Split

3 files

sound/core/oss/pcm_oss.c +2 −2
sound/core/pcm_native.c +1 −1
sound/usb/quirks.c +1 −0

sound/core/oss/pcm_oss.c+2−2

@@ -1326,7 +1326,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha · 1325 unmodified lines
1326	static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream substream, const char __user buf, size_t bytes)	1326	static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream substream, const char __user buf, size_t bytes)
1327	{	1327	{
1328	size_t xfer = 0;	1328	size_t xfer = 0;
1329	ssize_t tmp;	1329	ssize_t tmp = 0;
1330	struct snd_pcm_runtime *runtime = substream->runtime;	1330	struct snd_pcm_runtime *runtime = substream->runtime;
1331		1331
1332	if (atomic_read(&substream->mmap_count))	1332	if (atomic_read(&substream->mmap_count))
@@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream substream, char buf, · 100 unmodified lines
1433	static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream substream, char __user buf, size_t bytes)	1433	static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream substream, char __user buf, size_t bytes)
1434	{	1434	{
1435	size_t xfer = 0;	1435	size_t xfer = 0;
1436	ssize_t tmp;	1436	ssize_t tmp = 0;
1437	struct snd_pcm_runtime *runtime = substream->runtime;	1437	struct snd_pcm_runtime *runtime = substream->runtime;
1438		1438
1439	if (atomic_read(&substream->mmap_count))	1439	if (atomic_read(&substream->mmap_count))

sound/core/pcm_native.c+1−1

@@ -3422,7 +3422,7 @@ int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream, · 3421 unmodified lines
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;

sound/usb/quirks.c+1−0

@@ -1171,6 +1171,7 @@ static bool is_teac_dsd_dac(unsigned int id) · 1170 unmodified lines
1171	switch (id) {	1171	switch (id) {
1172	case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */	1172	case USB_ID(0x0644, 0x8043): /* TEAC UD-501/UD-503/NT-503 */
1173	case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */	1173	case USB_ID(0x0644, 0x8044): /* Esoteric D-05X */
		1174	case USB_ID(0x0644, 0x804a): /* TEAC UD-301 */
1174	return true;	1175	return true;
1175	}	1176	}
1176	return false;	1177	return false;