aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core/oss')
-rw-r--r--sound/core/oss/copy.c1
-rw-r--r--sound/core/oss/io.c1
-rw-r--r--sound/core/oss/linear.c1
-rw-r--r--sound/core/oss/mixer_oss.c1
-rw-r--r--sound/core/oss/mulaw.c1
-rw-r--r--sound/core/oss/pcm_oss.c4
-rw-r--r--sound/core/oss/pcm_plugin.c1
-rw-r--r--sound/core/oss/rate.c1
-rw-r--r--sound/core/oss/route.c1
9 files changed, 1 insertions, 11 deletions
diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c
index d6a04c2d5a75..9ded30d0e97d 100644
--- a/sound/core/oss/copy.c
+++ b/sound/core/oss/copy.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <linux/time.h> 22#include <linux/time.h>
24#include <sound/core.h> 23#include <sound/core.h>
25#include <sound/pcm.h> 24#include <sound/pcm.h>
diff --git a/sound/core/oss/io.c b/sound/core/oss/io.c
index 3ece39fc48db..f874f6ca3657 100644
--- a/sound/core/oss/io.c
+++ b/sound/core/oss/io.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <linux/time.h> 22#include <linux/time.h>
24#include <sound/core.h> 23#include <sound/core.h>
25#include <sound/pcm.h> 24#include <sound/pcm.h>
diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
index 06f96a3e86f6..da3dbd41669e 100644
--- a/sound/core/oss/linear.c
+++ b/sound/core/oss/linear.c
@@ -20,7 +20,6 @@
20 * 20 *
21 */ 21 */
22 22
23#include <sound/driver.h>
24#include <linux/time.h> 23#include <linux/time.h>
25#include <sound/core.h> 24#include <sound/core.h>
26#include <sound/pcm.h> 25#include <sound/pcm.h>
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c
index c5a5ab9cae8c..75daed298a15 100644
--- a/sound/core/oss/mixer_oss.c
+++ b/sound/core/oss/mixer_oss.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <linux/init.h> 22#include <linux/init.h>
24#include <linux/slab.h> 23#include <linux/slab.h>
25#include <linux/time.h> 24#include <linux/time.h>
diff --git a/sound/core/oss/mulaw.c b/sound/core/oss/mulaw.c
index 848db82529ed..77f96194a0ed 100644
--- a/sound/core/oss/mulaw.c
+++ b/sound/core/oss/mulaw.c
@@ -21,7 +21,6 @@
21 * 21 *
22 */ 22 */
23 23
24#include <sound/driver.h>
25#include <linux/time.h> 24#include <linux/time.h>
26#include <sound/core.h> 25#include <sound/core.h>
27#include <sound/pcm.h> 26#include <sound/pcm.h>
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index d0c4ceb9f0b4..4c601b192ddf 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -26,7 +26,6 @@
26#define OSS_DEBUG 26#define OSS_DEBUG
27#endif 27#endif
28 28
29#include <sound/driver.h>
30#include <linux/init.h> 29#include <linux/init.h>
31#include <linux/slab.h> 30#include <linux/slab.h>
32#include <linux/time.h> 31#include <linux/time.h>
@@ -985,10 +984,8 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
985 sw_params->stop_threshold = runtime->buffer_size; 984 sw_params->stop_threshold = runtime->buffer_size;
986 sw_params->tstamp_mode = SNDRV_PCM_TSTAMP_NONE; 985 sw_params->tstamp_mode = SNDRV_PCM_TSTAMP_NONE;
987 sw_params->period_step = 1; 986 sw_params->period_step = 1;
988 sw_params->sleep_min = 0;
989 sw_params->avail_min = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? 987 sw_params->avail_min = substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
990 1 : runtime->period_size; 988 1 : runtime->period_size;
991 sw_params->xfer_align = 1;
992 if (atomic_read(&substream->mmap_count) || 989 if (atomic_read(&substream->mmap_count) ||
993 substream->oss.setup.nosilence) { 990 substream->oss.setup.nosilence) {
994 sw_params->silence_threshold = 0; 991 sw_params->silence_threshold = 0;
@@ -1624,6 +1621,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
1624 snd_pcm_format_set_silence(runtime->format, 1621 snd_pcm_format_set_silence(runtime->format,
1625 runtime->oss.buffer, 1622 runtime->oss.buffer,
1626 size1); 1623 size1);
1624 size1 /= runtime->channels; /* frames */
1627 fs = snd_enter_user(); 1625 fs = snd_enter_user();
1628 snd_pcm_lib_write(substream, (void __user *)runtime->oss.buffer, size1); 1626 snd_pcm_lib_write(substream, (void __user *)runtime->oss.buffer, size1);
1629 snd_leave_user(fs); 1627 snd_leave_user(fs);
diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c
index 14095a927a1b..bec94138205e 100644
--- a/sound/core/oss/pcm_plugin.c
+++ b/sound/core/oss/pcm_plugin.c
@@ -24,7 +24,6 @@
24#define PLUGIN_DEBUG 24#define PLUGIN_DEBUG
25#endif 25#endif
26 26
27#include <sound/driver.h>
28#include <linux/slab.h> 27#include <linux/slab.h>
29#include <linux/time.h> 28#include <linux/time.h>
30#include <linux/vmalloc.h> 29#include <linux/vmalloc.h>
diff --git a/sound/core/oss/rate.c b/sound/core/oss/rate.c
index 9eb267913c38..14dfb3175d84 100644
--- a/sound/core/oss/rate.c
+++ b/sound/core/oss/rate.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <linux/time.h> 22#include <linux/time.h>
24#include <sound/core.h> 23#include <sound/core.h>
25#include <sound/pcm.h> 24#include <sound/pcm.h>
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index de3ffdeaf7e3..da7ab7a3e82c 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -19,7 +19,6 @@
19 * 19 *
20 */ 20 */
21 21
22#include <sound/driver.h>
23#include <linux/slab.h> 22#include <linux/slab.h>
24#include <linux/time.h> 23#include <linux/time.h>
25#include <sound/core.h> 24#include <sound/core.h>
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-01 20:48:13 -0400