July 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [patch] ASoC: dapm: using freed pointer in dapm_kcontrol_add_widget()
by Dan Carpenter 01 Aug '13

01 Aug '13

There is a typo here so we end up using the old freed pointer instead of the newly allocated one. (If the "n" is zero then the code works, obviously). Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- Only needed in linux-next diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9abb3b2..d74c356 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -225,13 +225,13 @@ static int dapm_kcontrol_add_widget(struct snd_kcontrol *kcontrol, new_data = krealloc(data, sizeof(*data) + sizeof(widget) * n, GFP_KERNEL); - if (!data) + if (!new_data) return -ENOMEM; - data->wlist.widgets[n - 1] = widget; - data->wlist.num_widgets = n; + new_data->wlist.widgets[n - 1] = widget; + new_data->wlist.num_widgets = n; - kcontrol->private_data = data; + kcontrol->private_data = new_data; return 0; }

4 7

[alsa-devel] New dapm panic on beaver with next-20130730
by Olof Johansson 31 Jul '13

31 Jul '13

Hi Mark, Lars-Peter, I noticed the below panic on beaver (Tegra30). Seems like seaboard (Tegra20) is fine. This is with next-20130730, tegra_defconfig. I noticed a bunch of recent dapm changes in the asoc tree on the 29th, and I was able to bisect it down to: commit 5106b92f80a2cd37c52cffed80b4f5acfb77ccfd Author: Lars-Peter Clausen <lars(a)metafoo.de> Date: Mon Jul 29 17:14:00 2013 +0200 ASoC: dapm: Keep a list of paths per kcontrol Currently we store for each path which control (if any at all) is associated with that control. But we are only ever interested in the reverse relationship, i.e. we want to know all the paths a certain control is associated with. This is currently implemented by always iterating over all paths. This patch updates the code to keep a list for each control which contains all the paths that are associated with that control. This improves the run time of e.g. soc_dapm_mixer_update_power() and soc_dapm_mux_update_power() from O(n) (with n being the number of paths for the card) to O(1). Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> Signed-off-by: Mark Brown <broonie(a)linaro.org> Panic output is below. I need to figure out why I'm not actually getting a backtrace in panics any more as well so this is of somewhat limited use, unfortuantely. Running a brute force function lookup on all words on the stack gives a rough idea of call path though: c03b1bb4 dapm_clear_walk_output c03b3450 dapm_generic_check_power c03b56b0 dapm_power_widgets c03b608c snd_soc_dapm_new_widgets [c069f8f8 kallsyms_token_index] c03ae9fc soc_post_component_init c03b0dd0 soc_probe_link_dais c069abb0 kallsyms_token_index [c029ac24 devm_kzalloc_release] c03b1870 snd_soc_register_card c03c3964 tegra_rt5640_probe c0707b74 tegra_rt5640_driver_init c02999e0 platform_drv_probe c02999c8 platform_drv_probe c029878c driver_probe_device [ 1.845620] Unable to handle kernel paging request at virtual address 6b6b6bd3 [ 1.852855] pgd = c0004000 [ 1.855552] [6b6b6bd3] *pgd=00000000 [ 1.859125] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 1.864422] Modules linked in: [ 1.867473] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 3.11.0-rc3-next-20130730 #42 [ 1.875023] task: ef064a40 ti: ef074000 task.ti: ef074000 [ 1.880421] PC is at dapm_clear_walk_output+0x8/0x68 [ 1.885371] LR is at dapm_clear_walk_output+0x54/0x68 [ 1.890408] pc : [<c03bb77c>] lr : [<c03bb7c8>] psr: 20000113 [ 1.890408] sp : ef075ce8 ip : 00000000 fp : 00000010 [ 1.901858] r10: ef075d2c r9 : c076dd00 r8 : c076dbf8 [ 1.907066] r7 : ef075d34 r6 : eeb490b8 r5 : 6b6b6bd3 r4 : ef39c4b0 [ 1.913574] r3 : 00000069 r2 : 00000192 r1 : 6b6b6bd3 r0 : eeb490b8 [ 1.920084] Flags: nzCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel [ 1.927372] Control: 10c5387d Table: 8000404a DAC: 00000015 [ 1.933101] Process swapper/0 (pid: 1, stack limit = 0xef074238) [ 1.939090] Stack: (0xef075ce8 to 0xef076000) [ 1.943434] 5ce0: ef39c4b0 ef3ad728 eeb490b8 c03bb7c8 ef3ad6c0 00000000 [ 1.951591] 5d00: 00000000 c03bd074 c076dcf8 ef3ad6c0 ef075d3c c03bf310 00000000 c076dcf8 [ 1.959747] 5d20: 00000000 eec537f0 c077ca0c ef075d2c ef075d2c ef075d34 ef075d34 ef075d3c [ 1.967904] 5d40: ef075d3c c01c298c eec66734 ef3ad584 c076dcd4 000000f0 ef3ad5a0 c076dce8 [ 1.976060] 5d60: c0587888 00000005 00000010 c03bfcd8 c0587888 00000000 c076dbf8 c076dc34 [ 1.984216] 5d80: 00000000 eeb56010 eeb49000 c076dbf8 00000000 c06ab0f8 c076dda8 00000000 [ 1.992374] 5da0: 00000002 c03b8618 00000000 00000000 00000000 eeb56010 00000000 ef21e3c0 [ 2.000531] 5dc0: c076dbf8 c076dda8 ef21e0c0 00000000 00000002 c03ba9e4 c076dc08 000000d0 [ 2.008688] 5de0: ef000500 c076a5a8 c076dd08 00000000 ef21e184 c076dcf8 c076a5ec eeb49000 [ 2.016844] 5e00: c076dce0 c076a5a8 ef3b1e8c eeb49034 c06a63ac c076dc18 c02a2a24 c076dbf8 [ 2.025001] 5e20: 000005d4 ef369a90 c17dd4f4 00000000 000000b3 ef074028 00000000 c03bb484 [ 2.033157] 5e40: c17dba28 c076db24 ef18ae10 c03cd59c c07bffd8 ef18ae10 00000000 c076db38 [ 2.041315] 5e60: c0712a54 c02a17e0 c02a17c8 c02a058c 00000000 ef18ae10 c076db38 ef18ae44 [ 2.049471] 5e80: 00000000 c02a0778 00000000 c076db38 c02a06ec c029eac8 ef06d0e0 ef181d74 [ 2.057627] 5ea0: c076db38 ef3af840 c07526d8 c029fd44 c06ab0d4 c076db38 00000006 c076db38 [ 2.065783] 5ec0: 00000006 c0777a40 c0777a40 c02a0d54 c07277c0 00000006 c0777a40 c0777a40 [ 2.073941] 5ee0: c0712a54 c00089f8 ef025900 c0659cf4 ef1160c0 c053b498 00000000 00000001 [ 2.082098] 5f00: 0000027c c073bd78 c17dd77b c0550080 000000b3 c003d884 00000000 c071d9dc [ 2.090254] 5f20: c06937c8 c06ed458 00000006 00000006 c003d198 c003d1f0 00000000 c07277c0 [ 2.098411] 5f40: 00000006 c0777a40 c0777a40 c06f027c 000000b3 c071d9dc c071d9d0 c06f0970 [ 2.106569] 5f60: 00000006 00000006 c06f027c ffffbfc7 ff7ffffd fffff7ff 9fffffff 00000000 [ 2.114726] 5f80: c0526f58 00000000 00000000 00000000 00000000 00000000 00000000 c0526f60 [ 2.122884] 5fa0: 00000000 00000000 c0526f58 c000e578 00000000 00000000 00000000 00000000 [ 2.131040] 5fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 2.139198] 5fe0: 00000000 00000000 00000000 00000000 00000013 00000000 bf7fcdff eefffeff [ 2.147359] Code: 1affffe1 eafffff5 e92d4070 e1a05001 (e5914000) [ 2.153588] ---[ end trace a5214c5b7e3cefc9 ]--- [ 2.158220] Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b

4 5

[alsa-devel] [PATCH v2] ASoC: omap-abe-twl6040: Remove support for pdata (legacy boot)
by Peter Ujfalusi 31 Jul '13

31 Jul '13

Just recently OMAP4 legacy boot support has been removed. No reason to keep the code used by the legacy boot (pdata based) since neither OMAP4 or OMAP5 can boot in this mode. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi Mark, Changes since v1: - Remove the header file which is no longer in use. Regards, Peter include/linux/platform_data/omap-abe-twl6040.h | 49 --------- sound/soc/omap/omap-abe-twl6040.c | 133 ++++++++----------------- 2 files changed, 41 insertions(+), 141 deletions(-) delete mode 100644 include/linux/platform_data/omap-abe-twl6040.h diff --git a/include/linux/platform_data/omap-abe-twl6040.h b/include/linux/platform_data/omap-abe-twl6040.h deleted file mode 100644 index 5d298ac..0000000 --- a/include/linux/platform_data/omap-abe-twl6040.h +++ /dev/null @@ -1,49 +0,0 @@ -/** - * omap-abe-twl6040.h - ASoC machine driver OMAP4+ devices, header. - * - * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com - * All rights reserved. - * - * Author: Peter Ujfalusi <peter.ujfalusi(a)ti.com> - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA - */ - -#ifndef _OMAP_ABE_TWL6040_H_ -#define _OMAP_ABE_TWL6040_H_ - -/* To select if only one channel is connected in a stereo port */ -#define ABE_TWL6040_LEFT (1 << 0) -#define ABE_TWL6040_RIGHT (1 << 1) - -struct omap_abe_twl6040_data { - char *card_name; - /* Feature flags for connected audio pins */ - u8 has_hs; - u8 has_hf; - bool has_ep; - u8 has_aux; - u8 has_vibra; - bool has_dmic; - bool has_hsmic; - bool has_mainmic; - bool has_submic; - u8 has_afm; - /* Other features */ - bool jack_detection; /* board can detect jack events */ - int mclk_freq; /* MCLK frequency speed for twl6040 */ -}; - -#endif /* _OMAP_ABE_TWL6040_H_ */ diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 70cd5c7..ebb1390 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -23,7 +23,6 @@ #include <linux/clk.h> #include <linux/platform_device.h> #include <linux/mfd/twl6040.h> -#include <linux/platform_data/omap-abe-twl6040.h> #include <linux/module.h> #include <linux/of.h> @@ -166,19 +165,10 @@ static const struct snd_soc_dapm_route audio_map[] = { {"AFMR", NULL, "Line In"}, }; -static inline void twl6040_disconnect_pin(struct snd_soc_dapm_context *dapm, - int connected, char *pin) -{ - if (!connected) - snd_soc_dapm_disable_pin(dapm, pin); -} - static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_card *card = codec->card; - struct snd_soc_dapm_context *dapm = &codec->dapm; - struct omap_abe_twl6040_data *pdata = dev_get_platdata(card->dev); struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); int hs_trim; int ret = 0; @@ -203,24 +193,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); } - /* - * NULL pdata means we booted with DT. In this case the routing is - * provided and the card is fully routed, no need to mark pins. - */ - if (!pdata) - return ret; - - /* Disable not connected paths if not used */ - twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone"); - twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); - twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); - twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); - twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vibrator"); - twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In"); - return ret; } @@ -274,13 +246,18 @@ static struct snd_soc_card omap_abe_card = { static int omap_abe_probe(struct platform_device *pdev) { - struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); struct device_node *node = pdev->dev.of_node; struct snd_soc_card *card = &omap_abe_card; + struct device_node *dai_node; struct abe_twl6040 *priv; int num_links = 0; int ret = 0; + if (!node) { + dev_err(&pdev->dev, "of node is missing.\n"); + return -ENODEV; + } + card->dev = &pdev->dev; priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL); @@ -289,78 +266,50 @@ static int omap_abe_probe(struct platform_device *pdev) priv->dmic_codec_dev = ERR_PTR(-EINVAL); - if (node) { - struct device_node *dai_node; - - if (snd_soc_of_parse_card_name(card, "ti,model")) { - dev_err(&pdev->dev, "Card name is not provided\n"); - return -ENODEV; - } + if (snd_soc_of_parse_card_name(card, "ti,model")) { + dev_err(&pdev->dev, "Card name is not provided\n"); + return -ENODEV; + } - ret = snd_soc_of_parse_audio_routing(card, - "ti,audio-routing"); - if (ret) { - dev_err(&pdev->dev, - "Error while parsing DAPM routing\n"); - return ret; - } + ret = snd_soc_of_parse_audio_routing(card, "ti,audio-routing"); + if (ret) { + dev_err(&pdev->dev, "Error while parsing DAPM routing\n"); + return ret; + } - dai_node = of_parse_phandle(node, "ti,mcpdm", 0); - if (!dai_node) { - dev_err(&pdev->dev, "McPDM node is not provided\n"); - return -EINVAL; - } - abe_twl6040_dai_links[0].cpu_dai_name = NULL; - abe_twl6040_dai_links[0].cpu_of_node = dai_node; + dai_node = of_parse_phandle(node, "ti,mcpdm", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McPDM node is not provided\n"); + return -EINVAL; + } + abe_twl6040_dai_links[0].cpu_dai_name = NULL; + abe_twl6040_dai_links[0].cpu_of_node = dai_node; - dai_node = of_parse_phandle(node, "ti,dmic", 0); - if (dai_node) { - num_links = 2; - abe_twl6040_dai_links[1].cpu_dai_name = NULL; - abe_twl6040_dai_links[1].cpu_of_node = dai_node; + dai_node = of_parse_phandle(node, "ti,dmic", 0); + if (dai_node) { + num_links = 2; + abe_twl6040_dai_links[1].cpu_dai_name = NULL; + abe_twl6040_dai_links[1].cpu_of_node = dai_node; - priv->dmic_codec_dev = platform_device_register_simple( + priv->dmic_codec_dev = platform_device_register_simple( "dmic-codec", -1, NULL, 0); - if (IS_ERR(priv->dmic_codec_dev)) { - dev_err(&pdev->dev, - "Can't instantiate dmic-codec\n"); - return PTR_ERR(priv->dmic_codec_dev); - } - } else { - num_links = 1; - } - - priv->jack_detection = of_property_read_bool(node, - "ti,jack-detection"); - of_property_read_u32(node, "ti,mclk-freq", - &priv->mclk_freq); - if (!priv->mclk_freq) { - dev_err(&pdev->dev, "MCLK frequency not provided\n"); - ret = -EINVAL; - goto err_unregister; + if (IS_ERR(priv->dmic_codec_dev)) { + dev_err(&pdev->dev, "Can't instantiate dmic-codec\n"); + return PTR_ERR(priv->dmic_codec_dev); } - - omap_abe_card.fully_routed = 1; - } else if (pdata) { - if (pdata->card_name) { - card->name = pdata->card_name; - } else { - dev_err(&pdev->dev, "Card name is not provided\n"); - return -ENODEV; - } - - if (pdata->has_dmic) - num_links = 2; - else - num_links = 1; - - priv->jack_detection = pdata->jack_detection; - priv->mclk_freq = pdata->mclk_freq; } else { - dev_err(&pdev->dev, "Missing pdata\n"); - return -ENODEV; + num_links = 1; + } + + priv->jack_detection = of_property_read_bool(node, "ti,jack-detection"); + of_property_read_u32(node, "ti,mclk-freq", &priv->mclk_freq); + if (!priv->mclk_freq) { + dev_err(&pdev->dev, "MCLK frequency not provided\n"); + ret = -EINVAL; + goto err_unregister; } + card->fully_routed = 1; if (!priv->mclk_freq) { dev_err(&pdev->dev, "MCLK frequency missing\n"); -- 1.8.3.2

2 1

[alsa-devel] [PATCH 0/3] ASoC: Add Freescale i.MX S/PDIF controller driver
by Nicolin Chen 31 Jul '13

31 Jul '13

* This series of patches add i.MX S/PDIF drivers, including CPU DAI, machine. * It also add two missing sample rates support for spdif dummy codec drivers Nicolin Chen (3): ASoC: codec: spdif: Add S20_3LE and S24_LE support for dummy codec drivers ASoC: fsl: Add S/PDIF CPU DAI driver ASoC: fsl: Add S/PDIF machine driver .../devicetree/bindings/sound/fsl,spdif.txt | 63 + .../devicetree/bindings/sound/imx-audio-spdif.txt | 29 + sound/soc/codecs/spdif_receiver.c | 2 + sound/soc/codecs/spdif_transmitter.c | 5 +- sound/soc/fsl/Kconfig | 14 + sound/soc/fsl/Makefile | 4 + sound/soc/fsl/fsl_spdif.c | 1276 ++++++++++++++++++++ sound/soc/fsl/fsl_spdif.h | 233 ++++ sound/soc/fsl/imx-spdif.c | 134 ++ 9 files changed, 1758 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,spdif.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt create mode 100644 sound/soc/fsl/fsl_spdif.c create mode 100644 sound/soc/fsl/fsl_spdif.h create mode 100644 sound/soc/fsl/imx-spdif.c

4 7

Re: [alsa-devel] [PATCH -next] ASoC: rcar: fix return value check in rsnd_gen1_probe()
by Mark Brown 31 Jul '13

31 Jul '13

On Tue, Jul 30, 2013 at 07:51:37AM +0800, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei(a)trendmicro.com.cn> > > In case of error, the function devm_ioremap_resource() returns ERR_PTR() > and never returns NULL. The NULL test in the return value check should be > replaced with IS_ERR(), and also remove the dev_err call to avoid redundant > error message. Applied, thanks.

1 0

[alsa-devel] [PATCH] ASoC: fsl: Fix module build
by Fabio Estevam 31 Jul '13

31 Jul '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Building imx_v6_v7_defconfig with all audio drivers as modules results in the folowing build error: ERROR: "imx_pcm_fiq_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! ERROR: "imx_pcm_fiq_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-imx-ssi.ko] undefined! ERROR: "imx_pcm_dma_init" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! ERROR: "imx_pcm_dma_exit" [sound/soc/fsl/snd-soc-fsl-ssi.ko] undefined! Fix this by allowing SND_SOC_IMX_PCM_FIQ and SND_SOC_IMX_PCM_DMA to be also built as modules and by using 'IS_ENABLED' to cover the module case. Reported-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/Kconfig | 4 ++-- sound/soc/fsl/imx-pcm.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 3a79d01..c26449b 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI tristate config SND_SOC_IMX_PCM_FIQ - bool + tristate select FIQ config SND_SOC_IMX_PCM_DMA - bool + tristate select SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_IMX_AUDMUX diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h index 9136625..5d5b733 100644 --- a/sound/soc/fsl/imx-pcm.h +++ b/sound/soc/fsl/imx-pcm.h @@ -38,7 +38,7 @@ struct imx_pcm_fiq_params { struct snd_dmaengine_dai_dma_data *dma_params_tx; }; -#ifdef CONFIG_SND_SOC_IMX_PCM_DMA +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) int imx_pcm_dma_init(struct platform_device *pdev); void imx_pcm_dma_exit(struct platform_device *pdev); #else @@ -52,7 +52,7 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) } #endif -#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) int imx_pcm_fiq_init(struct platform_device *pdev, struct imx_pcm_fiq_params *params); void imx_pcm_fiq_exit(struct platform_device *pdev); -- 1.8.1.2

3 4

[alsa-devel] [PATCH v2] ASoC: wm0010: Fix resource leak
by Dimitris Papastamos 31 Jul '13

31 Jul '13

If kzalloc() fails for `img' then we are going to leak the memory for `out'. We are freeing the memory of all the tx/rx transfers but the tx/rx buf pointers will be NULL if we drop out earlier. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm0010.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index f5e8356..10adc41 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -410,6 +410,16 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) rec->command, rec->length); len = rec->length + 8; + xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); + if (!xfer) { + dev_err(codec->dev, "Failed to allocate xfer\n"); + ret = -ENOMEM; + goto abort; + } + + xfer->codec = codec; + list_add_tail(&xfer->list, &xfer_list); + out = kzalloc(len, GFP_KERNEL); if (!out) { dev_err(codec->dev, @@ -417,6 +427,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) ret = -ENOMEM; goto abort1; } + xfer->t.rx_buf = out; img = kzalloc(len, GFP_KERNEL); if (!img) { @@ -425,24 +436,13 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) ret = -ENOMEM; goto abort1; } + xfer->t.tx_buf = img; byte_swap_64((u64 *)&rec->command, img, len); - xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); - if (!xfer) { - dev_err(codec->dev, "Failed to allocate xfer\n"); - ret = -ENOMEM; - goto abort1; - } - - xfer->codec = codec; - list_add_tail(&xfer->list, &xfer_list); - spi_message_init(&xfer->m); xfer->m.complete = wm0010_boot_xfer_complete; xfer->m.context = xfer; - xfer->t.tx_buf = img; - xfer->t.rx_buf = out; xfer->t.len = len; xfer->t.bits_per_word = 8; -- 1.8.3.4

2 1

[alsa-devel] [PATCH] ASoC: core: No need to use strncmp()
by Dimitris Papastamos 31 Jul '13

31 Jul '13

Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d68a486..9f60894 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2309,7 +2309,7 @@ struct snd_kcontrol *snd_soc_card_get_kcontrol(struct snd_soc_card *soc_card, return NULL; list_for_each_entry(kctl, &card->controls, list) - if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) + if (!strcmp(kctl->id.name, name)) return kctl; return NULL; } @@ -3056,7 +3056,7 @@ int snd_soc_limit_volume(struct snd_soc_codec *codec, return -EINVAL; list_for_each_entry(kctl, &card->controls, list) { - if (!strncmp(kctl->id.name, name, sizeof(kctl->id.name))) { + if (!strcmp(kctl->id.name, name)) { found = 1; break; } -- 1.8.3.4

2 5

[alsa-devel] [PATCH] ASoC: wm0010: Fix resource leak
by Dimitris Papastamos 31 Jul '13

31 Jul '13

This fixes "https://bugzilla.kernel.org/show_bug.cgi?id=60650". Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm0010.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index f5e8356..285026c 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -410,6 +410,13 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) rec->command, rec->length); len = rec->length + 8; + xfer = kzalloc(sizeof(*xfer), GFP_KERNEL | GFP_DMA); + if (!xfer) { + dev_err(codec->dev, "Failed to allocate xfer\n"); + ret = -ENOMEM; + goto abort1; + } + out = kzalloc(len, GFP_KERNEL); if (!out) { dev_err(codec->dev, @@ -417,6 +424,7 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) ret = -ENOMEM; goto abort1; } + xfer->t.rx_buf = out; img = kzalloc(len, GFP_KERNEL); if (!img) { @@ -425,24 +433,16 @@ static int wm0010_firmware_load(const char *name, struct snd_soc_codec *codec) ret = -ENOMEM; goto abort1; } + xfer->t.tx_buf = img; byte_swap_64((u64 *)&rec->command, img, len); - xfer = kzalloc(sizeof(*xfer), GFP_KERNEL); - if (!xfer) { - dev_err(codec->dev, "Failed to allocate xfer\n"); - ret = -ENOMEM; - goto abort1; - } - xfer->codec = codec; list_add_tail(&xfer->list, &xfer_list); spi_message_init(&xfer->m); xfer->m.complete = wm0010_boot_xfer_complete; xfer->m.context = xfer; - xfer->t.tx_buf = img; - xfer->t.rx_buf = out; xfer->t.len = len; xfer->t.bits_per_word = 8; -- 1.8.3.4

2 3

[alsa-devel] [PATCH] SOUND: au1x: Fix build
by Ralf Baechle 31 Jul '13

31 Jul '13

d8b51c11ff5a70244753ba60abfd47088cf4dcd4 [ASoC: ac97c: Use module_platform_driver()] broke the build: CC sound/soc/au1x/ac97c.o /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: expected identifier or ‘(’ before ‘&’ token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: pasting "__initcall_" and "&" does not give a valid preprocessing token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘&’ token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: expected identifier or ‘(’ before ‘&’ token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: pasting "__exitcall_" and "&" does not give a valid preprocessing token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:344:1: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘&’ token /home/ralf/src/linux/upstream-sfr/sound/soc/au1x/ac97c.c:334:31: warning: ‘au1xac97c_driver’ defined but not used [-Wunused-variable] make[5]: *** [sound/soc/au1x/ac97c.o] Error 1 make[4]: *** [sound/soc/au1x] Error 2 make[3]: *** [sound/soc] Error 2 Signed-off-by: Ralf Baechle <ralf(a)linux-mips.org> diff --git a/sound/soc/au1x/ac97c.c b/sound/soc/au1x/ac97c.c index d6f7694..c8a2de1 100644 --- a/sound/soc/au1x/ac97c.c +++ b/sound/soc/au1x/ac97c.c @@ -341,7 +341,7 @@ static struct platform_driver au1xac97c_driver = { .remove = au1xac97c_drvremove, }; -module_platform_driver(&au1xac97c_driver); +module_platform_driver(au1xac97c_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Au1000/1500/1100 AC97C ASoC driver");

2 1