December 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ALSA: hda/hdmi - Fix duplicate unref of pci_dev
by Lukas Wunner 10 Dec '19

10 Dec '19

Nicholas Johnson reports a null pointer deref as well as a refcount underflow upon hot-removal of a Thunderbolt-attached AMD eGPU. He's bisected the issue down to commit 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD"). The commit iterates over PCI devices using pci_get_class() and unreferences each device found, even though pci_get_class() subsequently unreferences the device as well. Fix it. Fixes: 586bc4aab878 ("ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD") Link: https://lore.kernel.org/r/PSXP216MB0438BFEAA0617283A834E11580580@PSXP216MB0… Reported-and-tested-by: Nicholas Johnson <nicholas.johnson-opensource(a)outlook.com.au> Signed-off-by: Lukas Wunner <lukas(a)wunner.de> Cc: Mika Westerberg <mika.westerberg(a)linux.intel.com> Cc: Alexander Deucher <alexander.deucher(a)amd.com> Cc: Bjorn Helgaas <helgaas(a)kernel.org> --- sound/pci/hda/hda_intel.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 35b4526f0d28..b856b89378ac 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1419,7 +1419,6 @@ static bool atpx_present(void) return true; } } - pci_dev_put(pdev); } return false; } -- 2.24.0

4 9

[alsa-devel] [PATCH 5.6 00/71] ALSA: Use managed buffer allocation
by Takashi Iwai 10 Dec '19

10 Dec '19

Hi, we already got a PCM core extension in 5.5-rc1 for allocating / releasing the PCM buffers implicitly, so called managed buffer allocation mode. This patch set is to apply this new mode for the actual (non-ASoC) drivers. The patches for ASoC and the other subsystems will follow in later patch sets. Also, other PCM API changes will follow later, too. This won't change anything from the functional POV, but merely cleanups. Takashi === Takashi Iwai (71): ALSA: aoa: Use managed buffer allocation ALSA: aaci: Use managed buffer allocation ALSA: atmel: Use managed buffer allocation ALSA: aloop: Use managed buffer allocation ALSA: dummy: Use managed buffer allocation ALSA: ml403: Use managed buffer allocation ALSA: pcsp: Use managed buffer allocation ALSA: vx: Use managed buffer allocation ALSA: firewire: Use managed buffer allocation ALSA: ad1816a: Use managed buffer allocation ALSA: cmi8330: Use managed buffer allocation ALSA: es1688: Use managed buffer allocation ALSA: es18xx: Use managed buffer allocation ALSA: sb: Use managed buffer allocation ALSA: gus: Use managed buffer allocation ALSA: wss: Use managed buffer allocation ALSA: mips: Use managed buffer allocation ALSA: parisc: Use managed buffer allocation ALSA: ad1889: Use managed buffer allocation ALSA: ali5451: Use managed buffer allocation ALSA: als300: Use managed buffer allocation ALSA: als4000: Use managed buffer allocation ALSA: asihpi: Use managed buffer allocation ALSA: atiixp: Use managed buffer allocation ALSA: au88x0: Use managed buffer allocation ALSA: aw2: Use managed buffer allocation ALSA: azt3328: Use managed buffer allocation ALSA: bt87x: Use managed buffer allocation ALSA: ca0106: Use managed buffer allocation ALSA: cmipci: Use managed buffer allocation ALSA: cs4281: Use managed buffer allocation ALSA: cs5535: Use managed buffer allocation ALSA: ctxfi: Use managed buffer allocation ALSA: echoaudio: Use managed buffer allocation ALSA: emu10k1x: Use managed buffer allocation ALSA: emu10k1: Use managed buffer allocation ALSA: ens137x: Use managed buffer allocation ALSA: es1938: Use managed buffer allocation ALSA: fm801: Use managed buffer allocation ALSA: hda: Use managed buffer allocation ALSA: ice1712: Use managed buffer allocation ALSA: ice1724: Use managed buffer allocation ALSA: intel8x0: Use managed buffer allocation ALSA: lola: Use managed buffer allocation ALSA: lx6464es: Use managed buffer allocation ALSA: maestro3: Use managed buffer allocation ALSA: mixart: Use managed buffer allocation ALSA: oxygen: Use managed buffer allocation ALSA: pcxhr: Use managed buffer allocation ALSA: riptide: Use managed buffer allocation ALSA: rme32: Use managed buffer allocation ALSA: sis7019: Use managed buffer allocation ALSA: sonicvibes: Use managed buffer allocation ALSA: trident: Use managed buffer allocation ALSA: via82xx: Use managed buffer allocation ALSA: ymfpci: Use managed buffer allocation ALSA: pdaudiocf: Use managed buffer allocation ALSA: pmac: Use managed buffer allocation ALSA: ps3: Use managed buffer allocation ALSA: aica: Use managed buffer allocation ALSA: sh: Use managed buffer allocation ALSA: sparc: Use managed buffer allocation ALSA: spi: Use managed buffer allocation ALSA: 6fire: Use managed buffer allocation ALSA: caiaq: Use managed buffer allocation ALSA: hiface: Use managed buffer allocation ALSA: line6: Use managed buffer allocation ALSA: ua101: Use managed buffer allocation ALSA: usx2y: Use managed buffer allocation ALSA: usb-audio: Use managed buffer allocation ALSA: hdml-lpe-audio: Use managed buffer allocation sound/aoa/soundbus/i2sbus/pcm.c | 11 +------ sound/arm/aaci.c | 40 +++++++++-------------- sound/atmel/ac97c.c | 20 ++---------- sound/drivers/aloop.c | 12 ++----- sound/drivers/dummy.c | 14 ++------ sound/drivers/ml403-ac97cr.c | 29 +++-------------- sound/drivers/pcsp/pcsp_lib.c | 17 ++++------ sound/drivers/vx/vx_pcm.c | 27 ++------------- sound/firewire/bebob/bebob_pcm.c | 11 ++----- sound/firewire/dice/dice-pcm.c | 13 +++----- sound/firewire/digi00x/digi00x-pcm.c | 11 ++----- sound/firewire/fireface/ff-pcm.c | 9 ++--- sound/firewire/fireworks/fireworks_pcm.c | 11 ++----- sound/firewire/isight.c | 10 ++---- sound/firewire/motu/motu-pcm.c | 11 ++----- sound/firewire/oxfw/oxfw-pcm.c | 17 +++------- sound/firewire/tascam/tascam-pcm.c | 11 ++----- sound/isa/ad1816a/ad1816a_lib.c | 20 ++---------- sound/isa/cmi8330.c | 5 ++- sound/isa/es1688/es1688_lib.c | 20 ++---------- sound/isa/es18xx.c | 24 +++----------- sound/isa/gus/gus_pcm.c | 28 +++++----------- sound/isa/sb/sb16_main.c | 21 ++---------- sound/isa/sb/sb8_main.c | 21 ++---------- sound/isa/wss/wss_lib.c | 23 ++----------- sound/mips/hal2.c | 25 ++------------ sound/mips/sgio2audio.c | 20 ++---------- sound/parisc/harmony.c | 18 +++------- sound/pci/ad1889.c | 24 ++------------ sound/pci/ali5451/ali5451.c | 30 ++--------------- sound/pci/als300.c | 23 ++----------- sound/pci/als4000.c | 23 ++----------- sound/pci/asihpi/asihpi.c | 10 ++---- sound/pci/atiixp.c | 14 +++----- sound/pci/atiixp_modem.c | 9 ++--- sound/pci/au88x0/au88x0_pcm.c | 15 ++------- sound/pci/aw2/aw2-alsa.c | 45 +++++++------------------ sound/pci/azt3328.c | 30 +++-------------- sound/pci/bt87x.c | 14 +++----- sound/pci/ca0106/ca0106_main.c | 56 ++++---------------------------- sound/pci/cmipci.c | 36 ++++++-------------- sound/pci/cs4281.c | 20 ++---------- sound/pci/cs5535audio/cs5535audio_pcm.c | 12 +++---- sound/pci/ctxfi/ctpcm.c | 15 +++------ sound/pci/echoaudio/echoaudio.c | 19 +++-------- sound/pci/emu10k1/emu10k1x.c | 15 ++++----- sound/pci/emu10k1/emupcm.c | 41 ++++------------------- sound/pci/emu10k1/p16v.c | 48 ++++----------------------- sound/pci/ens1370.c | 27 +++------------ sound/pci/es1938.c | 28 ++-------------- sound/pci/fm801.c | 20 ++---------- sound/pci/hda/hda_controller.c | 13 +++----- sound/pci/ice1712/ice1712.c | 42 +++++------------------- sound/pci/ice1712/ice1724.c | 25 +++++--------- sound/pci/intel8x0.c | 11 +++---- sound/pci/intel8x0m.c | 23 +++---------- sound/pci/lola/lola_pcm.c | 11 +++---- sound/pci/lx6464es/lx6464es.c | 14 ++------ sound/pci/maestro3.c | 9 ++--- sound/pci/mixart/mixart.c | 14 +++----- sound/pci/oxygen/oxygen_pcm.c | 52 +++++++++++++---------------- sound/pci/pcxhr/pcxhr.c | 31 ++++-------------- sound/pci/riptide/riptide.c | 10 +++--- sound/pci/rme32.c | 35 ++++---------------- sound/pci/sis7019.c | 25 ++------------ sound/pci/sonicvibes.c | 20 ++---------- sound/pci/trident/trident_main.c | 49 +++++++++++----------------- sound/pci/via82xx.c | 45 ++++++++++--------------- sound/pci/via82xx_modem.c | 9 ++--- sound/pci/ymfpci/ymfpci_main.c | 33 +++++-------------- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 25 ++------------ sound/ppc/pmac.c | 28 ++-------------- sound/ppc/snd_ps3.c | 28 +++------------- sound/sh/aica.c | 29 +++-------------- sound/sh/sh_dac_audio.c | 20 ++---------- sound/sparc/amd7930.c | 20 ++---------- sound/sparc/cs4231.c | 17 ++-------- sound/sparc/dbri.c | 13 ++------ sound/spi/at73c213.c | 11 ++----- sound/usb/6fire/pcm.c | 17 +--------- sound/usb/caiaq/audio.c | 13 ++------ sound/usb/hiface/pcm.c | 18 ++-------- sound/usb/line6/pcm.c | 13 ++------ sound/usb/misc/ua101.c | 23 +++---------- sound/usb/pcm.c | 15 +++------ sound/usb/usx2y/usbusx2yaudio.c | 26 +++++---------- sound/usb/usx2y/usx2yhwdeppcm.c | 18 +++++----- sound/x86/intel_hdmi_audio.c | 16 ++++----- 88 files changed, 402 insertions(+), 1492 deletions(-) -- 2.16.4

2 76

[alsa-devel] [PATCH for-5.6 0/2] usb:gadget: ALSA PCM API updates
by Takashi Iwai 10 Dec '19

10 Dec '19

Hi, this is a patch set to adapt the latest ALSA PCM API to staging drivers. Basically these are merely cleanups, as shown in diffstat, and there should be no functional changes. As the corresponding ALSA PCM API change is found in 5.5-rc1, please apply these on 5.5-rc1 or later. Or if you prefer, I can merge them through sound tree, too. Let me know. thanks, Takashi === Takashi Iwai (2): usb: gadget: u_audio: Use managed buffer allocation usb: gadget: u_audio: Drop superfluous ioctl PCM ops drivers/usb/gadget/function/u_audio.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) -- 2.16.4

1 2

[alsa-devel] [PATCH 0/2] ASoC: topology: fix error handling
by Pierre-Louis Bossart 10 Dec '19

10 Dec '19

Two additional patches from Dragos to deal with errors with bad topologies, reviewed on GitHub last week. https://github.com/thesofproject/linux/pull/1598 Thanks Dragos! Dragos Tarcatu (2): ASoC: topology: Check return value for snd_soc_add_dai_link() ASoC: topology: Check return value for soc_tplg_pcm_create() sound/soc/soc-topology.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) -- 2.20.1

2 4

[alsa-devel] [PATCH] ASoC: simple-card: Don't create separate link when platform is present
by Daniel Baluta 10 Dec '19

10 Dec '19

In normal sound case all DAIs are detected as CPU-Codec. simple_dai_link_of supports the presence of a platform but it counts it as a CPU DAI resulting in the creation of an extra link. Adding a platform property to a link description like: simple-audio-card,dai-link { cpu { sound-dai = <&sai1>; }; plat { sound-dai = <&dsp>; }; codec { sound-dai = <&wm8960>; } will result in the creation of two links: * sai1 <-> wm8960 * dsp <-> wm8960 which is obviously not what we want. We just want one single link with: * sai1 <-> wm8960 (and platform set to dsp). Signed-off-by: Daniel Baluta <daniel.baluta(a)nxp.com> --- sound/soc/generic/simple-card.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 10b82bf043d1..55e9f8800b3e 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -371,6 +371,7 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, do { struct asoc_simple_data adata; struct device_node *codec; + struct device_node *plat; struct device_node *np; int num = of_get_child_count(node); @@ -381,6 +382,9 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, ret = -ENODEV; goto error; } + /* get platform */ + plat = of_get_child_by_name(node, is_top ? + PREFIX "plat" : "plat"); /* get convert-xxx property */ memset(&adata, 0, sizeof(adata)); @@ -389,6 +393,8 @@ static int simple_for_each_link(struct asoc_simple_priv *priv, /* loop for all CPU/Codec node */ for_each_child_of_node(node, np) { + if (plat == np) + continue; /* * It is DPCM * if it has many CPUs, -- 2.17.1

3 2

[alsa-devel] [PATCH 0/8] ASoC: SOF: improvements for v5.6
by Pierre-Louis Bossart 10 Dec '19

10 Dec '19

Mix of new interfaces for firmware functionality (channel map, ASRC), corrections to loader code, BYT/CHT improvements w/ BYT-CR support, HDaudio codec mask and CometLake machine driver detection. Amery Song (1): ASoC: Intel: common: work-around incorrect ACPI HID for CML boards Curtis Malainey (1): ASoC: SOF: Intel: split cht and byt debug window sizes Kai Vehmanen (1): ASoC: SOF: Intel: add codec_mask module parameter Karol Trzcinski (2): ASoC: SOF: loader: snd_sof_fw_parse_ext_data log warning on unknown header ASoC: SOF: loader: fix snd_sof_fw_parse_ext_data Pierre-Louis Bossart (1): ASoC: SOF: Intel: byt: fixup topology filename for BYT-CR Seppo Ingalsuo (1): ASoC: SOF: Add asynchronous sample rate converter topology support Slawomir Blauciak (1): ASoC: SOF: ipc: channel map structures include/sound/sof/channel_map.h | 61 +++++++++++++++ include/sound/sof/topology.h | 27 +++++++ include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 6 ++ .../intel/common/soc-acpi-intel-cml-match.c | 41 ++++++---- sound/soc/sof/intel/byt.c | 54 ++++++++++++- sound/soc/sof/intel/hda-ctrl.c | 13 ++++ sound/soc/sof/loader.c | 7 +- sound/soc/sof/topology.c | 78 +++++++++++++++++++ 9 files changed, 265 insertions(+), 24 deletions(-) create mode 100644 include/sound/sof/channel_map.h -- 2.20.1

2 16

[alsa-devel] [PATCH v2 00/15][resend] ASoC: soc-core cleanup step6
by Kuninori Morimoto 10 Dec '19

10 Dec '19

Hi Mark These are resend of v2 of soc-core cleanup step6. These doesn't add new features. Kuninori Morimoto (15): ASoC: soc-core: remove dai_link_list ASoC: soc-core: remove snd_soc_disconnect_sync() ASoC: soc-core: remove snd_soc_get_dai_substream() ASoC: soc-core: move snd_soc_get_pcm_runtime() ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() ASoC: soc-core: move snd_soc_find_dai_link() ASoC: soc-core: rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime() ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime() ASoC: soc-core: move soc_link_dai_pcm_new() ASoC: soc-core: rename soc_link_dai_pcm_new() to soc_dai_pcm_new() ASoC: soc-core: move soc_link_init() ASoC: soc-core: add missing return value check for soc_link_init() ASoC: soc-core: rename soc_link_init() to soc_init_pcm_runtime() ASoC: soc-core: soc_set_name_prefix(): tidyup loop condition ASoC: soc-core: soc_set_name_prefix(): get component device_node at out of loop include/sound/soc.h | 22 +-- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/samsung/bells.c | 12 +- sound/soc/samsung/littlemill.c | 10 +- sound/soc/samsung/snow.c | 2 +- sound/soc/samsung/speyside.c | 4 +- sound/soc/samsung/tm2_wm5110.c | 6 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/rcar/core.c | 2 - sound/soc/soc-core.c | 339 ++++++++++++++++------------------------- sound/soc/soc-topology.c | 47 +++++- sound/soc/tegra/tegra_wm8903.c | 2 +- 13 files changed, 204 insertions(+), 252 deletions(-) -- 2.7.4

2 30

[alsa-devel] broonie-sound/for-next bisection: boot on rk3399-gru-kevin
by kernelci.org bot 10 Dec '19

10 Dec '19

* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * This automated bisection report was sent to you on the basis * * that you may be involved with the breaking commit it has * * found. No manual investigation has been done to verify it, * * and the root cause of the problem may be somewhere else. * * * * If you do send a fix, please include this trailer: * * Reported-by: "kernelci.org bot" <bot(a)kernelci.org> * * * * Hope this helps! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * broonie-sound/for-next bisection: boot on rk3399-gru-kevin Summary: Start: 3778790e1d13 Merge branch 'asoc-5.6' into asoc-next Details: https://kernelci.org/boot/id/5deef68acb72c66093960f08 Plain log: https://storage.kernelci.org//broonie-sound/for-next/v5.5-rc1-46-g3778790e1… HTML log: https://storage.kernelci.org//broonie-sound/for-next/v5.5-rc1-46-g3778790e1… Result: abe3b6727b65 ASoC: cs42l51: add dac mux widget in codec routes Checks: revert: PASS verify: PASS Parameters: Tree: broonie-sound URL: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git Branch: for-next Target: rk3399-gru-kevin CPU arch: arm64 Lab: lab-collabora Compiler: gcc-8 Config: defconfig Test suite: boot Breaking commit found: ------------------------------------------------------------------------------- commit abe3b6727b653307c27870a2d4ecbf9de4e914a5 Author: Olivier Moysan <olivier.moysan(a)st.com> Date: Tue Dec 3 15:16:27 2019 +0100 ASoC: cs42l51: add dac mux widget in codec routes Add "DAC mux" DAPM widget in CS42l51 audio codec routes, to support DAC mux control and to remove error trace "DAC Mux has no paths" at widget creation. Note: ADC path of DAC mux is not routed in this patch. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> Link: https://lore.kernel.org/r/20191203141627.29471-1-olivier.moysan@st.com Signed-off-by: Mark Brown <broonie(a)kernel.org> diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index 55408c8fcb4e..e47758e4fb36 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c @@ -214,12 +214,10 @@ static const struct snd_soc_dapm_widget cs42l51_dapm_widgets[] = { SND_SOC_DAPM_ADC_E("Right ADC", "Right HiFi Capture", CS42L51_POWER_CTL1, 2, 1, cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Left DAC", "Left HiFi Playback", - CS42L51_POWER_CTL1, 5, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), - SND_SOC_DAPM_DAC_E("Right DAC", "Right HiFi Playback", - CS42L51_POWER_CTL1, 6, 1, - cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Left DAC", NULL, CS42L51_POWER_CTL1, 5, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), + SND_SOC_DAPM_DAC_E("Right DAC", NULL, CS42L51_POWER_CTL1, 6, 1, + cs42l51_pdn_event, SND_SOC_DAPM_PRE_POST_PMD), /* analog/mic */ SND_SOC_DAPM_INPUT("AIN1L"), @@ -255,6 +253,12 @@ static const struct snd_soc_dapm_route cs42l51_routes[] = { {"HPL", NULL, "Left DAC"}, {"HPR", NULL, "Right DAC"}, + {"Right DAC", NULL, "DAC Mux"}, + {"Left DAC", NULL, "DAC Mux"}, + + {"DAC Mux", "Direct PCM", "Playback"}, + {"DAC Mux", "DSP PCM", "Playback"}, + {"Left ADC", NULL, "Left PGA"}, {"Right ADC", NULL, "Right PGA"}, ------------------------------------------------------------------------------- Git bisection log: ------------------------------------------------------------------------------- git bisect start # good: [e42617b825f8073569da76dc4510bfa019b1c35a] Linux 5.5-rc1 git bisect good e42617b825f8073569da76dc4510bfa019b1c35a # bad: [3778790e1d1329223601c63602286ad1d73c480f] Merge branch 'asoc-5.6' into asoc-next git bisect bad 3778790e1d1329223601c63602286ad1d73c480f # bad: [3e62579436c6a7fc35de7318e6c5f495b8d0046c] ASoC: SOF: core: modify the signature for snd_sof_create_page_table git bisect bad 3e62579436c6a7fc35de7318e6c5f495b8d0046c # good: [62d5ae4cafb7ffeeec6ba2dd1814cafeeea7dd8f] ASoC: max98090: save and restore SHDN when changing sensitive registers git bisect good 62d5ae4cafb7ffeeec6ba2dd1814cafeeea7dd8f # bad: [bc9a665581b3c6c82c9220a47f6573b49ce2df0b] ASoC: fix soc-core.c kernel-doc warning git bisect bad bc9a665581b3c6c82c9220a47f6573b49ce2df0b # bad: [abe3b6727b653307c27870a2d4ecbf9de4e914a5] ASoC: cs42l51: add dac mux widget in codec routes git bisect bad abe3b6727b653307c27870a2d4ecbf9de4e914a5 # good: [49df1e3925824cf44e590daac635974270185841] ASoC: rsnd: Calculate DALIGN inversion at run-time git bisect good 49df1e3925824cf44e590daac635974270185841 # first bad commit: [abe3b6727b653307c27870a2d4ecbf9de4e914a5] ASoC: cs42l51: add dac mux widget in codec routes -------------------------------------------------------------------------------

2 1

[alsa-devel] [PATCH] ASoC: cs42l42: add missed regulator_bulk_disable in remove and fix probe failure
by Chuhong Yuan 10 Dec '19

10 Dec '19

The driver forgets to call regulator_bulk_disable() in remove like that in probe failure. Besides, some failed branches in probe do not handle failure correctly. Add the missed call and revise wrong direct returns to fix it. Fixes: 2c394ca79604b ("ASoC: Add support for CS42L42 codec") Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/soc/codecs/cs42l42.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 5125bb9b37b5..96b3cff50ce9 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1796,8 +1796,10 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, /* Reset the Device */ cs42l42->reset_gpio = devm_gpiod_get_optional(&i2c_client->dev, "reset", GPIOD_OUT_LOW); - if (IS_ERR(cs42l42->reset_gpio)) - return PTR_ERR(cs42l42->reset_gpio); + if (IS_ERR(cs42l42->reset_gpio)) { + ret = PTR_ERR(cs42l42->reset_gpio); + goto err_disable; + } if (cs42l42->reset_gpio) { dev_dbg(&i2c_client->dev, "Found reset GPIO\n"); @@ -1831,13 +1833,13 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, dev_err(&i2c_client->dev, "CS42L42 Device ID (%X). Expected %X\n", devid, CS42L42_CHIP_ID); - return ret; + goto err_disable; } ret = regmap_read(cs42l42->regmap, CS42L42_REVID, &reg); if (ret < 0) { dev_err(&i2c_client->dev, "Get Revision ID failed\n"); - return ret; + goto err_disable; } dev_info(&i2c_client->dev, @@ -1863,7 +1865,7 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_client, if (i2c_client->dev.of_node) { ret = cs42l42_handle_device_data(i2c_client, cs42l42); if (ret != 0) - return ret; + goto err_disable; } /* Setup headset detection */ @@ -1892,6 +1894,8 @@ static int cs42l42_i2c_remove(struct i2c_client *i2c_client) /* Hold down reset */ gpiod_set_value_cansleep(cs42l42->reset_gpio, 0); + regulator_bulk_disable(ARRAY_SIZE(cs42l42->supplies), + cs42l42->supplies); return 0; } -- 2.24.0

2 5

[alsa-devel] [PATCH 1/3] treewide: Fix -Wformat=2 warnings
by Rosen Penev 10 Dec '19

10 Dec '19

Allows the compiler to check these formats at compile time. Fixed several such warnings. Signed-off-by: Rosen Penev <rosenp(a)gmail.com> --- include/use-case.h | 1 + src/error.c | 2 ++ src/input.c | 6 ++++-- src/output.c | 6 ++++-- src/pcm/pcm.c | 4 ++-- src/pcm/pcm_direct.c | 2 +- src/pcm/pcm_file.c | 6 +++--- src/topology/builder.c | 3 ++- src/ucm/ucm_local.h | 2 ++ 9 files changed, 21 insertions(+), 11 deletions(-) diff --git a/include/use-case.h b/include/use-case.h index 2efcb4d8..3f0cf58e 100644 --- a/include/use-case.h +++ b/include/use-case.h @@ -188,6 +188,7 @@ typedef struct snd_use_case_mgr snd_use_case_mgr_t; * \param ... Optional arguments for sprintf like format * \return Allocated string identifier or NULL on error */ +__attribute__((format(printf, 1, 2))) char *snd_use_case_identifier(const char *fmt, ...); /** diff --git a/src/error.c b/src/error.c index 2e617f87..ad281411 100644 --- a/src/error.c +++ b/src/error.c @@ -95,6 +95,7 @@ snd_local_error_handler_t snd_lib_error_set_local(snd_local_error_handler_t func * \ref snd_lib_error_set_local, it is called. Otherwise, prints the error * message including location to \c stderr. */ +__attribute__((format(printf, 5, 6))) static void snd_lib_error_default(const char *file, int line, const char *function, int err, const char *fmt, ...) { va_list arg; @@ -149,6 +150,7 @@ const char *snd_asoundlib_version(void) /* * internal error handling */ +__attribute__((format(printf, 5, 6))) static void snd_err_msg_default(const char *file, int line, const char *function, int err, const char *fmt, ...) { va_list arg; diff --git a/src/input.c b/src/input.c index 35324f1f..c204fe7b 100644 --- a/src/input.c +++ b/src/input.c @@ -132,6 +132,7 @@ static int snd_input_stdio_close(snd_input_t *input ATTRIBUTE_UNUSED) return 0; } +__attribute__((format(scanf, 2, 0))) static int snd_input_stdio_scan(snd_input_t *input, const char *format, va_list args) { snd_input_stdio_t *stdio = input->private_data; @@ -144,7 +145,7 @@ static char *snd_input_stdio_gets(snd_input_t *input, char *str, size_t size) snd_input_stdio_t *stdio = input->private_data; return fgets(str, (int) size, stdio->fp); } - + static int snd_input_stdio_getc(snd_input_t *input) { snd_input_stdio_t *stdio = input->private_data; @@ -236,6 +237,7 @@ static int snd_input_buffer_close(snd_input_t *input) return 0; } +__attribute__((format(scanf, 2, 0))) static int snd_input_buffer_scan(snd_input_t *input, const char *format, va_list args) { snd_input_buffer_t *buffer = input->private_data; @@ -262,7 +264,7 @@ static char *snd_input_buffer_gets(snd_input_t *input, char *str, size_t size) *str = '\0'; return str; } - + static int snd_input_buffer_getc(snd_input_t *input) { snd_input_buffer_t *buffer = input->private_data; diff --git a/src/output.c b/src/output.c index 7e3a91b3..935ab003 100644 --- a/src/output.c +++ b/src/output.c @@ -141,6 +141,7 @@ static int snd_output_stdio_close(snd_output_t *output) return 0; } +__attribute__((format(printf, 2, 0))) static int snd_output_stdio_print(snd_output_t *output, const char *format, va_list args) { snd_output_stdio_t *stdio = output->private_data; @@ -152,7 +153,7 @@ static int snd_output_stdio_puts(snd_output_t *output, const char *str) snd_output_stdio_t *stdio = output->private_data; return fputs(str, stdio->fp); } - + static int snd_output_stdio_putc(snd_output_t *output, int c) { snd_output_stdio_t *stdio = output->private_data; @@ -268,6 +269,7 @@ static int snd_output_buffer_need(snd_output_t *output, size_t size) return buffer->alloc - buffer->size; } +__attribute__((format(printf, 2, 0))) static int snd_output_buffer_print(snd_output_t *output, const char *format, va_list args) { snd_output_buffer_t *buffer = output->private_data; @@ -304,7 +306,7 @@ static int snd_output_buffer_puts(snd_output_t *output, const char *str) buffer->size += size; return size; } - + static int snd_output_buffer_putc(snd_output_t *output, int c) { snd_output_buffer_t *buffer = output->private_data; diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 1064044c..09dfe967 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -8241,7 +8241,7 @@ int snd_pcm_chmap_print(const snd_pcm_chmap_t *map, size_t maxlen, char *buf) return -ENOMEM; } if (map->pos[i] & SND_CHMAP_DRIVER_SPEC) - len += snprintf(buf + len, maxlen - len, "%d", p); + len += snprintf(buf + len, maxlen - len, "%u", p); else { const char *name = chmap_names[p]; if (name) @@ -8249,7 +8249,7 @@ int snd_pcm_chmap_print(const snd_pcm_chmap_t *map, size_t maxlen, char *buf) "%s", name); else len += snprintf(buf + len, maxlen - len, - "Ch%d", p); + "Ch%u", p); } if (len >= maxlen) return -ENOMEM; diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 54d99005..719e1692 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -1406,7 +1406,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) SNDERR("unable to info for slave pcm"); return ret; } - sprintf(name, "hw:CLASS=%i,SCLASS=0,CARD=%i,DEV=%i,SUBDEV=%i", + sprintf(name, "hw:CLASS=%i,SCLASS=0,CARD=%i,DEV=%u,SUBDEV=%u", (int)SND_TIMER_CLASS_PCM, snd_pcm_info_get_card(&info), snd_pcm_info_get_device(&info), diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index a02b2dc0..c874e863 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -155,7 +155,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) next char */ switch (*(++old_index_ch)) { case RATE_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->rate); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); @@ -164,7 +164,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) break; case CHANNELS_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->channels); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); @@ -173,7 +173,7 @@ static int snd_pcm_file_replace_fname(snd_pcm_file_t *file, char **new_fname_p) break; case BWIDTH_KEY: - snprintf(value, sizeof(value), "%d", + snprintf(value, sizeof(value), "%u", pcm->frame_bits/pcm->channels); err = snd_pcm_file_append_value(&new_fname, &new_index_ch, &new_len, value); diff --git a/src/topology/builder.c b/src/topology/builder.c index 5ae3ae89..3adbad45 100644 --- a/src/topology/builder.c +++ b/src/topology/builder.c @@ -21,6 +21,7 @@ #include "tplg_local.h" /* verbose output detailing each object size and file position */ +__attribute__((format(printf, 2, 3))) static void verbose(snd_tplg_t *tplg, const char *fmt, ...) { int offset; @@ -244,7 +245,7 @@ static int write_manifest_data(snd_tplg_t *tplg) return ret; } - verbose(tplg, "manifest : write %d bytes\n", sizeof(tplg->manifest)); + verbose(tplg, "manifest : write %zu bytes\n", sizeof(tplg->manifest)); ret = write(tplg->out_fd, &tplg->manifest, sizeof(tplg->manifest)); if (ret < 0) { SNDERR("error: failed to write manifest %d\n", ret); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index ba961507..696a60dc 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -246,7 +246,9 @@ struct snd_use_case_mgr { #define uc_dbg(fmt, arg...) do { } while (0) #endif +__attribute__((format(printf, 1, 2))) void uc_mgr_error(const char *fmt, ...); +__attribute__((format(printf, 1, 2))) void uc_mgr_stdout(const char *fmt, ...); int uc_mgr_config_load(int format, const char *file, snd_config_t **cfg); -- 2.23.0

1 2