aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss/pcm_oss.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-03-30 13:11:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-03-30 13:11:14 -0400
commitef82f598a01b497dd243ba20f704e29efffacb09 (patch)
tree7d7f82f7879a56d04dff1e5ead056811e53306d1 /sound/core/oss/pcm_oss.c
parentc2a9838452a4d71f76103c18c926468a9ea05713 (diff)
parent5607dddbfca774fb38bffadcb077fe03aa4ac5c6 (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/oss/pcm_oss.c')
-rw-r--r--sound/core/oss/pcm_oss.c4
1 files changed, 2 insertions, 2 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
1326static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const char __user *buf, size_t bytes) 1326static 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,
1433static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __user *buf, size_t bytes) 1433static 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))