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 ...
Showing the changes to include (2 of 50 files). Show all
Unified · Split
| @@ -802,8 +802,13 @@ struct snd_soc_component_driver { · 801 unmodified lines | ||
| 802 | 802 | int probe_order; |
| 803 | 803 | int remove_order; |
| 804 | 804 | |
| 805 | − /* signal if the module handling the component cannot be removed */ | |
| 806 | − unsigned int ignore_module_refcount:1; | |
| 805 | + /* | |
| 806 | + * signal if the module handling the component should not be removed | |
| 807 | + * if a pcm is open. Setting this would prevent the module | |
| 808 | + * refcount being incremented in probe() but allow it be incremented | |
| 809 | + * when a pcm is opened and decremented when it is closed. | |
| 810 | + */ | |
| 811 | + unsigned int module_get_upon_open:1; | |
| 807 | 812 | |
| 808 | 813 | /* bits */ |
| 809 | 814 | unsigned int idle_bias_on:1; |
| @@ -1083,6 +1088,8 @@ struct snd_soc_card { · 273 unmodified lines | ||
| 1083 | 1088 | struct mutex mutex; |
| 1084 | 1089 | struct mutex dapm_mutex; |
| 1085 | 1090 | |
| 1091 | + spinlock_t dpcm_lock; | |
| 1092 | + | |
| 1086 | 1093 | bool instantiated; |
| 1087 | 1094 | bool topology_shortname_created; |
| 1088 | 1095 | |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | |
| 33 | 33 | #ifndef __KERNEL__ |
| 34 | 34 | #include <stdlib.h> |
| 35 | +#include <time.h> | |
| 35 | 36 | #endif |
| 36 | 37 | |
| 37 | 38 | /* |