Merge branch 'for-linus' into for-next (99fff44f) · Commits · 戴 / test

include/sound/soc.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -802,8 +802,13 @@ struct snd_soc_component_driver {
		int probe_order;
		int remove_order;

		/* signal if the module handling the component cannot be removed */
		unsigned int ignore_module_refcount:1;
		/*
		* signal if the module handling the component should not be removed
		* if a pcm is open. Setting this would prevent the module
		* refcount being incremented in probe() but allow it be incremented
		* when a pcm is opened and decremented when it is closed.
		*/
		unsigned int module_get_upon_open:1;

		/* bits */
		unsigned int idle_bias_on:1;
		@@ -1083,6 +1088,8 @@ struct snd_soc_card {
		struct mutex mutex;
		struct mutex dapm_mutex;

		spinlock_t dpcm_lock;

		bool instantiated;
		bool topology_shortname_created;

include/uapi/sound/asound.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@

		#ifndef __KERNEL__
		#include <stdlib.h>
		#include <time.h>
		#endif

		/*

sound/core/oss/pcm_oss.c

+22 −21

Original line number	Diff line number	Diff line
		@@ -940,6 +940,28 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)
		oss_frame_size = snd_pcm_format_physical_width(params_format(params)) *
		params_channels(params) / 8;

		err = snd_pcm_oss_period_size(substream, params, sparams);
		if (err < 0)
		goto failure;

		n = snd_pcm_plug_slave_size(substream, runtime->oss.period_bytes / oss_frame_size);
		err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, n, NULL);
		if (err < 0)
		goto failure;

		err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIODS,
		runtime->oss.periods, NULL);
		if (err < 0)
		goto failure;

		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);

		err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, sparams);
		if (err < 0) {
		pcm_dbg(substream->pcm, "HW_PARAMS failed: %i\n", err);
		goto failure;
		}

		#ifdef CONFIG_SND_PCM_OSS_PLUGINS
		snd_pcm_oss_plugin_clear(substream);
		if (!direct) {
		@@ -974,27 +996,6 @@ static int snd_pcm_oss_change_params_locked(struct snd_pcm_substream *substream)
		}
		#endif

		err = snd_pcm_oss_period_size(substream, params, sparams);
		if (err < 0)
		goto failure;

		n = snd_pcm_plug_slave_size(substream, runtime->oss.period_bytes / oss_frame_size);
		err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, n, NULL);
		if (err < 0)
		goto failure;

		err = snd_pcm_hw_param_near(substream, sparams, SNDRV_PCM_HW_PARAM_PERIODS,
		runtime->oss.periods, NULL);
		if (err < 0)
		goto failure;

		snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DROP, NULL);

		if ((err = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_HW_PARAMS, sparams)) < 0) {
		pcm_dbg(substream->pcm, "HW_PARAMS failed: %i\n", err);
		goto failure;
		}

		if (runtime->oss.trigger) {
		sw_params->start_threshold = 1;
		} else {

sound/core/pcm_native.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1445,8 +1445,15 @@ static int snd_pcm_pause(struct snd_pcm_substream *substream, int push)
		static int snd_pcm_pre_suspend(struct snd_pcm_substream *substream, int state)
		{
		struct snd_pcm_runtime *runtime = substream->runtime;
		if (runtime->status->state == SNDRV_PCM_STATE_SUSPENDED)
		switch (runtime->status->state) {
		case SNDRV_PCM_STATE_SUSPENDED:
		return -EBUSY;
		/* unresumable PCM state; return -EBUSY for skipping suspend */
		case SNDRV_PCM_STATE_OPEN:
		case SNDRV_PCM_STATE_SETUP:
		case SNDRV_PCM_STATE_DISCONNECTED:
		return -EBUSY;
		}
		runtime->trigger_master = substream;
		return 0;
		}

sound/core/rawmidi.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include <linux/module.h>
		#include <linux/delay.h>
		#include <linux/mm.h>
		#include <linux/nospec.h>
		#include <sound/rawmidi.h>
		#include <sound/info.h>
		#include <sound/control.h>
		@@ -601,6 +602,7 @@ static int __snd_rawmidi_info_select(struct snd_card *card,
		return -ENXIO;
		if (info->stream < 0 \|\| info->stream > 1)
		return -EINVAL;
		info->stream = array_index_nospec(info->stream, 2);
		pstr = &rmidi->streams[info->stream];
		if (pstr->substream_count == 0)
		return -ENOENT;

Admin message