Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27bcd37e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This became a largish pull-request, as we've got a bunch of pending
  ASoC fixes at this time. One noticeable change is the removal of error
  directive in uapi/sound/asoc.h. We found that the API has been already
  used on Chromebooks, so we need to support it even now.

  A slight big LOC is found in Qualcomm lpass driver, but the rest are
  all small and easy fixes for ASoC drivers (sti, sun4i, Realtek codecs,
  Intel, tas571x, etc) in addition to the patches to harden the ALSA
  core proc file accesses"

* tag 'sound-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
  ALSA: info: Return error for invalid read/write
  ALSA: info: Limit the proc text input size
  ASoC: samsung: spdif: Fix DMA filter initialization
  ASoC: sun4i-codec: Enable bus clock after getting GPIO
  ASoC: lpass-cpu: add module licence and description
  ASoC: lpass-platform: Fix broken pcm data usage
  ASoC: sun4i-codec: return error code instead of NULL when create_card fails
  ASoC: hdmi-codec: Fix hdmi_of_xlate_dai_name when #sound-dai-cells = <0>
  ASoC: samsung: get access to DMA engine early to defer probe properly
  ASoC: da7219: Connect output enable register to DAIOUT
  ASoC: Intel: Skylake: Fix to turn off hdmi power on probe failure
  ASoC: sti-sas: enable fast io for regmap
  ASoC: sti: fix channel status update after playback start
  ASoC: PXA: Brownstone needs I2C
  ASoC: Intel: Skylake: Always acquire runtime pm ref on unload
  ASoC: Intel: Atom: add terminate entry for dmi_system_id tables
  ASoC: rt298: fix jack type detect error
  ASoC: rt5663: fix a debug statement
  ASoC: cs4270: fix DAPM stream name mismatch
  ASoC: Intel: haswell depends on sst-firmware
  ...
parents 3c6106da 6809cd68

include/uapi/sound/asoc.h

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ 
#include <linux/types.h>

#include <sound/asound.h>



#ifndef __KERNEL__

#error This API is an early revision and not enabled in the current

#error kernel release, it will be enabled in a future kernel version

#error with incompatible changes to what is here.

#endif



/*

 * Maximum number of channels topology kcontrol can represent.

 */

sound/core/info.c

+8 −1
Original line number Diff line number Diff line
@@ -325,10 +325,15 @@ static ssize_t snd_info_text_entry_write(struct file *file, 
	size_t next;

	int err = 0;



	if (!entry->c.text.write)

		return -EIO;

	pos = *offset;

	if (!valid_pos(pos, count))

		return -EIO;

	next = pos + count;

	/* don't handle too large text inputs */

	if (next > 16 * 1024)

		return -EIO;

	mutex_lock(&entry->access);

	buf = data->wbuffer;

	if (!buf) {
@@ -366,7 +371,9 @@ static int snd_info_seq_show(struct seq_file *seq, void *p) 
	struct snd_info_private_data *data = seq->private;

	struct snd_info_entry *entry = data->entry;



	if (entry->c.text.read) {

	if (!entry->c.text.read) {

		return -EIO;

	} else {

		data->rbuffer->buffer = (char *)seq; /* XXX hack! */

		entry->c.text.read(entry, data->rbuffer);

	}

sound/soc/codecs/cs4270.c

+4 −4
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ SND_SOC_DAPM_OUTPUT("AOUTR"), 
};



static const struct snd_soc_dapm_route cs4270_dapm_routes[] = {

	{ "Capture", NULL, "AINA" },

	{ "Capture", NULL, "AINB" },

	{ "Capture", NULL, "AINL" },

	{ "Capture", NULL, "AINR" },



	{ "AOUTA", NULL, "Playback" },

	{ "AOUTB", NULL, "Playback" },

	{ "AOUTL", NULL, "Playback" },

	{ "AOUTR", NULL, "Playback" },

};



/**

sound/soc/codecs/da7219.c

+2 −1
Original line number Diff line number Diff line
@@ -880,7 +880,8 @@ static const struct snd_soc_dapm_widget da7219_dapm_widgets[] = { 
			    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),



	/* DAI */

	SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, SND_SOC_NOPM, 0, 0),

	SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, DA7219_DAI_TDM_CTRL,

			     DA7219_DAI_OE_SHIFT, DA7219_NO_INVERT),

	SND_SOC_DAPM_AIF_IN("DAIIN", "Playback", 0, SND_SOC_NOPM, 0, 0),



	/* Output Muxes */

sound/soc/codecs/hdmi-codec.c

+6 −1
Original line number Diff line number Diff line
@@ -364,7 +364,12 @@ static int hdmi_of_xlate_dai_name(struct snd_soc_component *component, 
				  struct of_phandle_args *args,

				  const char **dai_name)

{

	int id = args->args[0];

	int id;



	if (args->args_count)

		id = args->args[0];

	else

		id = 0;



	if (id < ARRAY_SIZE(hdmi_dai_name)) {

		*dai_name = hdmi_dai_name[id];