Commit 372686e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Well, this one became unpleasantly larger than previous pull requests,
  but it's a kind of usual pattern: now it contains a collection of ASoC
  fixes, and nothing to worry too much.

  The fixes for ASoC core (DAPM, DPCM, topology) are all small and just
  covering corner cases. The rest changes are driver-specific, many of
  which are for x86 platforms and new drivers like STM32, in addition to
  the usual fixups for HD-audio"

* tag 'sound-5.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (66 commits)
  ASoC: wcd9335: Fix missing regmap requirement
  ALSA: hda: Fix racy display power access
  ASoC: pcm: fix error handling when try_module_get() fails.
  ASoC: stm32: sai: fix master clock management
  ASoC: Intel: kbl: fix wrong number of channels
  ALSA: hda - Add two more machines to the power_save_blacklist
  ASoC: pcm: update module refcount if module_get_upon_open is set
  ASoC: core: conditionally increase module refcount on component open
  ASoC: stm32: fix sai driver name initialisation
  ASoC: topology: Use the correct dobj to free enum control values and texts
  ALSA: seq: Fix OOB-reads from strlcpy
  ASoC: intel: skylake: add remove() callback for component driver
  ASoC: cs35l35: Disable regulators on driver removal
  ALSA: xen-front: Do not use stream buffer size before it is set
  ASoC: rockchip: pdm: change dma burst to 8
  ASoC: rockchip: pdm: fix regmap_ops hang issue
  ASoC: simple-card: don't select DPCM via simple-audio-card
  ASoC: audio-graph-card: don't select DPCM via audio-graph-card
  ASoC: tlv320aic32x4: Change author's name
  ALSA: hda/realtek - Add quirk for Tuxedo XC 1509
  ...
parents f2a73469 9b0dcd0e

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/seq/seq_clientmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int snd_seq_ioctl_set_client_info(struct snd_seq_client *client, 


	/* fill the info fields */

	if (client_info->name[0])

		strlcpy(client->name, client_info->name, sizeof(client->name));

		strscpy(client->name, client_info->name, sizeof(client->name));



	client->filter = client_info->filter;

	client->event_lost = client_info->event_lost;
@@ -1530,7 +1530,7 @@ static int snd_seq_ioctl_create_queue(struct snd_seq_client *client, void *arg) 
	/* set queue name */

	if (!info->name[0])

		snprintf(info->name, sizeof(info->name), "Queue-%d", q->queue);

	strlcpy(q->name, info->name, sizeof(q->name));

	strscpy(q->name, info->name, sizeof(q->name));

	snd_use_lock_free(&q->use_lock);



	return 0;
@@ -1592,7 +1592,7 @@ static int snd_seq_ioctl_set_queue_info(struct snd_seq_client *client, 
		queuefree(q);

		return -EPERM;

	}

	strlcpy(q->name, info->name, sizeof(q->name));

	strscpy(q->name, info->name, sizeof(q->name));

	queuefree(q);



	return 0;

sound/hda/ext/hdac_ext_bus.c

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ int snd_hdac_ext_bus_init(struct hdac_bus *bus, struct device *dev, 
	INIT_LIST_HEAD(&bus->hlink_list);

	bus->idx = idx++;



	mutex_init(&bus->lock);

	bus->cmd_dma_state = true;



	return 0;

sound/hda/hdac_bus.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ int snd_hdac_bus_init(struct hdac_bus *bus, struct device *dev, 
	INIT_WORK(&bus->unsol_work, snd_hdac_bus_process_unsol_events);

	spin_lock_init(&bus->reg_lock);

	mutex_init(&bus->cmd_mutex);

	mutex_init(&bus->lock);

	bus->irq = -1;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE