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

include/sound/soc-dapm.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -392,8 +392,6 @@ int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_put_enum_double_locked(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol);
		int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_info *uinfo);
		int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,

+1 −1

Original line number	Diff line number	Diff line
		@@ -1157,7 +1157,7 @@ struct snd_soc_pcm_runtime {
		((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \
		(i)++)
		#define for_each_rtd_codec_dai_rollback(rtd, i, dai) \
		for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)
		for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)

		void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);

+8 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_p
		if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
		plugin = snd_pcm_plug_last(plug);
		while (plugin && drv_frames > 0) {
		if (drv_frames > plugin->buf_frames)
		drv_frames = plugin->buf_frames;
		plugin_prev = plugin->prev;
		if (plugin->src_frames)
		drv_frames = plugin->src_frames(plugin, drv_frames);
		@@ -220,6 +222,8 @@ snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *plug, snd_p
		plugin_next = plugin->next;
		if (plugin->dst_frames)
		drv_frames = plugin->dst_frames(plugin, drv_frames);
		if (drv_frames > plugin->buf_frames)
		drv_frames = plugin->buf_frames;
		plugin = plugin_next;
		}
		} else
		@@ -248,11 +252,15 @@ snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *plug, snd_pc
		if (frames < 0)
		return frames;
		}
		if (frames > plugin->buf_frames)
		frames = plugin->buf_frames;
		plugin = plugin_next;
		}
		} else if (stream == SNDRV_PCM_STREAM_CAPTURE) {
		plugin = snd_pcm_plug_last(plug);
		while (plugin) {
		if (frames > plugin->buf_frames)
		frames = plugin->buf_frames;
		plugin_prev = plugin->prev;
		if (plugin->src_frames) {
		frames = plugin->src_frames(plugin, frames);

+6 −3

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ EXPORT_SYMBOL_GPL(snd_hdac_ext_bus_link_power_down_all);
		int snd_hdac_ext_bus_link_get(struct hdac_bus *bus,
		struct hdac_ext_link *link)
		{
		unsigned long codec_mask;
		int ret = 0;

		mutex_lock(&bus->lock);
		@@ -280,9 +281,11 @@ int snd_hdac_ext_bus_link_get(struct hdac_bus *bus,
		* HDA spec section 4.3 - Codec Discovery
		*/
		udelay(521);
		bus->codec_mask = snd_hdac_chip_readw(bus, STATESTS);
		dev_dbg(bus->dev, "codec_mask = 0x%lx\n", bus->codec_mask);
		snd_hdac_chip_writew(bus, STATESTS, bus->codec_mask);
		codec_mask = snd_hdac_chip_readw(bus, STATESTS);
		dev_dbg(bus->dev, "codec_mask = 0x%lx\n", codec_mask);
		snd_hdac_chip_writew(bus, STATESTS, codec_mask);
		if (!bus->codec_mask)
		bus->codec_mask = codec_mask;
		}

		mutex_unlock(&bus->lock);

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,7 +250,7 @@ void snd_hdac_print_channel_allocation(int spk_alloc, char *buf, int buflen)

		for (i = 0, j = 0; i < ARRAY_SIZE(cea_speaker_allocation_names); i++) {
		if (spk_alloc & (1 << i))
		j += snprintf(buf + j, buflen - j, " %s",
		j += scnprintf(buf + j, buflen - j, " %s",
		cea_speaker_allocation_names[i]);
		}
		buf[j] = '\0'; /* necessary when j == 0 */