Unverified Commit cd1fa301 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.6' of... 

Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
parents fae664eb d237851d

sound/soc/codecs/tas2562.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ static int tas2562_hw_params(struct snd_pcm_substream *substream, 




	ret = tas2562_set_samplerate(tas2562, params_rate(params));

	ret = tas2562_set_samplerate(tas2562, params_rate(params));

	if (ret)

	if (ret)

		dev_err(tas2562->dev, "set bitwidth failed, %d\n", ret);

		dev_err(tas2562->dev, "set sample rate failed, %d\n", ret);





	return ret;

	return ret;

}

}

sound/soc/soc-component.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -451,7 +451,7 @@ int snd_soc_pcm_component_sync_stop(struct snd_pcm_substream *substream) 
	int i, ret;

	int i, ret;





	for_each_rtd_components(rtd, i, component) {

	for_each_rtd_components(rtd, i, component) {

		if (component->driver->ioctl) {

		if (component->driver->sync_stop) {

			ret = component->driver->sync_stop(component,

			ret = component->driver->sync_stop(component,

							   substream);

							   substream);

			if (ret < 0)

			if (ret < 0)

sound/soc/soc-dapm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -4794,7 +4794,7 @@ static void soc_dapm_shutdown_dapm(struct snd_soc_dapm_context *dapm) 
			continue;

			continue;

		if (w->power) {

		if (w->power) {

			dapm_seq_insert(w, &down_list, false);

			dapm_seq_insert(w, &down_list, false);

			w->power = 0;

			w->new_power = 0;

			powerdown = 1;

			powerdown = 1;

		}

		}

	}

	}

sound/soc/codecs/rt1015.c

+1 −1

File changed.

Contains only whitespace changes.