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

[alsa-devel] [PATCH] ASoC: wm2000: Lock state machine updates
by Mark Brown 23 Jan '13

23 Jan '13

Need to ensure we don't get confused by simultaneous updates. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2000.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 655f43e..4d809ab 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -77,6 +77,8 @@ struct wm2000_priv { int anc_download_size; char *anc_download; + + struct mutex lock; }; static int wm2000_write(struct i2c_client *i2c, unsigned int reg, @@ -614,13 +616,20 @@ static int wm2000_anc_mode_put(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); int anc_active = ucontrol->value.enumerated.item[0]; + int ret; if (anc_active > 1) return -EINVAL; + mutex_lock(&wm2000->lock); + wm2000->anc_active = anc_active; - return wm2000_anc_set_mode(wm2000); + ret = wm2000_anc_set_mode(wm2000); + + mutex_unlock(&wm2000->lock); + + return ret; } static int wm2000_speaker_get(struct snd_kcontrol *kcontrol, @@ -640,13 +649,20 @@ static int wm2000_speaker_put(struct snd_kcontrol *kcontrol, struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); int val = ucontrol->value.enumerated.item[0]; + int ret; if (val > 1) return -EINVAL; + mutex_lock(&wm2000->lock); + wm2000->spk_ena = val; - return wm2000_anc_set_mode(wm2000); + ret = wm2000_anc_set_mode(wm2000); + + mutex_unlock(&wm2000->lock); + + return ret; } static const struct snd_kcontrol_new wm2000_controls[] = { @@ -663,6 +679,9 @@ static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, { struct snd_soc_codec *codec = w->codec; struct wm2000_priv *wm2000 = dev_get_drvdata(codec->dev); + int ret; + + mutex_lock(&wm2000->lock); if (SND_SOC_DAPM_EVENT_ON(event)) wm2000->anc_eng_ena = 1; @@ -670,7 +689,11 @@ static int wm2000_anc_power_event(struct snd_soc_dapm_widget *w, if (SND_SOC_DAPM_EVENT_OFF(event)) wm2000->anc_eng_ena = 0; - return wm2000_anc_set_mode(wm2000); + ret = wm2000_anc_set_mode(wm2000); + + mutex_unlock(&wm2000->lock); + + return ret; } static const struct snd_soc_dapm_widget wm2000_dapm_widgets[] = { @@ -800,6 +823,8 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, return -ENOMEM; } + mutex_init(&wm2000->lock); + dev_set_drvdata(&i2c->dev, wm2000); wm2000->regmap = devm_regmap_init_i2c(i2c, &wm2000_regmap); -- 1.7.10.4

1 0

[alsa-devel] repeated hda_codec_cleanup_stream
by Raj Upadhyaya 23 Jan '13

23 Jan '13

(Bugzilla bug title..) [Fwd: [Bug 894259] Sound is garbled on playback of OGG, MP3s, WAV files and videos with sound.] I am trying to debug why I have some sound problems with my set up. I have recently recompiled the kernel to 3.8.0-rc4. Here is a suggestion that I got recently from the debugging session. The message -> ALSA hda_codec.c:1499 hda_codec_cleanup_stream: is coming up in dmesg quite often. Is this OK, given my kernel compile options? - Raj -------- Forwarded Message -------- From: bugzilla(a)redhat.com To: raj(a)upadhyaya.com Subject: [Bug 894259] Sound is garbled on playback of OGG, MP3s, WAV files and videos with sound. Date: Wed, 23 Jan 2013 06:04:20 +0000 Product: Fedora https://bugzilla.redhat.com/show_bug.cgi?id=894259 --- Comment #17 from Raymond <superquad.vortex2(a)gmail.com> --- i think you better report the repeated hda_codec_cleanup_stream to alsa development mailing list .374225] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x25 [ 32.374575] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x2 [ 32.374581] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x3 [ 32.374585] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x4 [ 32.374588] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x5 [ 32.374592] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x25 [ 32.374916] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x2 [ 32.374921] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x3 [ 32.374925] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x4 [ 32.374929] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x5 [ 32.374932] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x25 [ 32.375602] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x2 [ 32.375607] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x3 [ 32.375611] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x4 [ 32.375615] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x5 [ 32.375619] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x25 [ 32.376435] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x2 [ 32.376440] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x3 [ 32.376444] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x4 [ 32.376448] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x5 [ 32.376452] ALSA hda_codec.c:1499 hda_codec_cleanup_stream: NID=0x25 -- You are receiving this mail because: You reported the bug.

2 1

[alsa-devel] sound/pci/hda/patch_analog.c:4987 patch_ad1882() error: potentially derefencing uninitialized 'spec'.
by Dan Carpenter 22 Jan '13

22 Jan '13

Hi Takashi, FYI, there are new smatch warnings show up in tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git master head: 96349b211586f3a6f2750bc4ea195bd9739465b6 commit: e87b24f711c797f1277188dc85b866bec17704a0 ALSA: hda - Rearrange for dropping static quirk codes in AD codec driver New smatch warnings: sound/pci/hda/patch_analog.c:4987 patch_ad1882() error: potentially derefencing uninitialized 'spec'. git remote add sound-unstable git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-unstable.git git remote update sound-unstable git checkout e87b24f711c797f1277188dc85b866bec17704a0 vim +/spec +4987 sound/pci/hda/patch_analog.c e87b24f7 Takashi Iwai 2013-01-22 4971 #ifdef ENABLE_AD_STATIC_QUIRKS 0ac8551e Takashi Iwai 2007-06-20 4972 static int patch_ad1882(struct hda_codec *codec) 0ac8551e Takashi Iwai 2007-06-20 4973 { 0ac8551e Takashi Iwai 2007-06-20 4974 struct ad198x_spec *spec; c5a4bcd0 Takashi Iwai 2009-02-06 4975 int err, board_config; 0ac8551e Takashi Iwai 2007-06-20 4976 78bb3cb0 Takashi Iwai 2012-12-21 4977 board_config = snd_hda_check_board_config(codec, AD1882_MODELS, 78bb3cb0 Takashi Iwai 2012-12-21 4978 ad1882_models, NULL); e87b24f7 Takashi Iwai 2013-01-22 4979 if (board_config == AD1882_AUTO) e87b24f7 Takashi Iwai 2013-01-22 4980 return ad1882_parse_auto_config(codec); 78bb3cb0 Takashi Iwai 2012-12-21 4981 c5a4bcd0 Takashi Iwai 2009-02-06 4982 err = snd_hda_attach_beep_device(codec, 0x10); c5a4bcd0 Takashi Iwai 2009-02-06 4983 if (err < 0) { c5a4bcd0 Takashi Iwai 2009-02-06 4984 ad198x_free(codec); c5a4bcd0 Takashi Iwai 2009-02-06 4985 return err; c5a4bcd0 Takashi Iwai 2009-02-06 4986 } c5a4bcd0 Takashi Iwai 2009-02-06 @4987 set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); c5a4bcd0 Takashi Iwai 2009-02-06 4988 0ac8551e Takashi Iwai 2007-06-20 4989 spec->multiout.max_channels = 6; 0ac8551e Takashi Iwai 2007-06-20 4990 spec->multiout.num_dacs = 3; 0ac8551e Takashi Iwai 2007-06-20 4991 spec->multiout.dac_nids = ad1882_dac_nids; 0ac8551e Takashi Iwai 2007-06-20 4992 spec->multiout.dig_out_nid = AD1882_SPDIF_OUT; 0ac8551e Takashi Iwai 2007-06-20 4993 spec->num_adc_nids = ARRAY_SIZE(ad1882_adc_nids); 0ac8551e Takashi Iwai 2007-06-20 4994 spec->adc_nids = ad1882_adc_nids; 0ac8551e Takashi Iwai 2007-06-20 4995 spec->capsrc_nids = ad1882_capsrc_nids; --- 0-DAY kernel build testing backend Open Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation

2 1

[alsa-devel] [PATCH 00/12] More updates on HD-audio generic parser
by Takashi Iwai 22 Jan '13

22 Jan '13

Hi, not surprisingly, here is another batch for fixing / improving the HD-audio generic parser code. With these, now AD and IDT codecs have proper analog-loopback features, and VIA and Conexant codecs have better aamix handling. The conflict of aamixer and indep-hp mode seen on VIA codecs should have been fixed now. As usual, all changes are found in test/hda-gen-parser (or test/hda-migrate) branch of sound-unstable tree. It's already merged in master branch as well. Takashi

2 14

Re: [alsa-devel] HD-audio regression after commit 34588709af61be1550b4e2bcee5c85d0ac4f34d4
by Takashi Iwai 22 Jan '13

22 Jan '13

At Sat, 19 Jan 2013 00:33:52 -0500, Miro Hodak wrote: > > On Fri, Jan 18, 2013 at 1:45 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > > > > > > > OK, thanks for quick tests! > > > > > > Takashi > > > > Testing latest updates in sound-unstable: > > commit f741c8a1f649379f8f3eb81119df2676c46075cf > Merge: d821c1e 164a7ad > Author: Takashi Iwai <tiwai(a)suse.de> > Date: Fri Jan 18 18:30:00 2013 +0100 > > Playback and capture appear to work correctly with one possible caveats: > > Item labeled "Front" controls the level of sound through the speakers. I > would expect that it would only control sound from front HP. This happens > whether Independent HP is on and off. When you look at other controls, there are "Surround", "Center", and "LFE", and these are mixer controls for other two line-out jacks. In that sense, "Front" is corresponding to the same group, the line out jack. You have an individual "Headphone" output. Isn't it obvious? Takashi

3 15

[alsa-devel] [asoc:topic/ioremap 1/1] sound/soc/codecs/jz4740.c:364:2: error: implicit declaration of function 'devm_ioremap_resource'
by kbuild test robot 22 Jan '13

22 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/ioremap head: bc96ea9b07adce5ec678899ea2604bd38677938e commit: bc96ea9b07adce5ec678899ea2604bd38677938e [1/1] ASoC: Convert to devm_ioremap_resource() config: make ARCH=i386 allyesconfig All error/warnings: sound/soc/codecs/jz4740.c: In function 'jz4740_codec_probe': >> sound/soc/codecs/jz4740.c:364:2: error: implicit declaration of function 'devm_ioremap_resource' [-Werror=implicit-function-declaration] sound/soc/codecs/jz4740.c:364:7: warning: assignment makes pointer from integer without a cast [enabled by default] cc1: some warnings being treated as errors vim +/devm_ioremap_resource +364 sound/soc/codecs/jz4740.c 358 jz4740_codec = devm_kzalloc(&pdev->dev, sizeof(*jz4740_codec), 359 GFP_KERNEL); 360 if (!jz4740_codec) 361 return -ENOMEM; 362 363 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > 364 base = devm_ioremap_resource(&pdev->dev, mem); 365 if (IS_ERR(base)) 366 return PTR_ERR(base); 367 --- 0-DAY kernel build testing backend Open Source Technology Center http://lists.01.org/mailman/listinfo/kbuild Intel Corporation

1 0

[alsa-devel] HDA independent headphone
by Raymond Yau 22 Jan '13

22 Jan '13

> > > Actually, it works fine in Skype when using "AD1989B Analog (hw: 0,2)". I > > > was confused because I changed only "Speakers" to that device and tried > > > making a test sound. That did not work, apparently test sound goes to > > > whatever "Ringing" is set to. But when making actual calls, it works as > > > expected and I can take advantage of the Independent HP feature. > > > > Hm, there should be nothing to touch the indep-HP mixer control from > > PCM, so I have no idea why it went wrong. > > > > BTW, I guess we have still an issue regarding indep HP. When it's ON, > > should the auto-mute be disabled, no? > > Although one can disable the automute manually, it'd be maybe more > > user-friendly if the driver does it by itself. > > > > The patch is below, already merged in test/hda-gen-parser branch (and > test/hda-migrate and master branch, too), as usual. > Does it mean that the value of the "front headphone jack" kcontrol is no longer updated when the independent headphone is switch on ? > > --- > From: Takashi Iwai <tiwai(a)suse.de> > Subject: [PATCH] ALSA: hda - Disable HP auto-mute during independent HP mode > > Both the HP auto-mute and the independent HP mode conflict with each > other. Make HP auto-mute disabled (only for the affected HP jack) > during the driver is in HP independent mode. > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > --- > sound/pci/hda/hda_generic.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c > index 63d12ef..258fb5e 100644 > --- a/sound/pci/hda/hda_generic.c > +++ b/sound/pci/hda/hda_generic.c > @@ -1889,6 +1889,13 @@ static int indep_hp_put(struct snd_kcontrol *kcontrol, > *dacp = 0; > else > *dacp = spec->alt_dac_nid; > + > + /* update HP auto-mute state too */ > + if (spec->hp_automute_hook) > + spec->hp_automute_hook(codec, NULL); > + else > + snd_hda_gen_hp_automute(codec, NULL); > + > ret = 1; > } > unlock: > @@ -3467,10 +3474,16 @@ static void call_update_outputs(struct hda_codec *codec) > void snd_hda_gen_hp_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) > { > struct hda_gen_spec *spec = codec->spec; > + hda_nid_t *pins = spec->autocfg.hp_pins; > + int num_pins = ARRAY_SIZE(spec->autocfg.hp_pins); > + > + /* No detection for the first HP jack during indep-HP mode */ > + if (spec->indep_hp_enabled) { > + pins++; > + num_pins--; > + } > > - spec->hp_jack_present = > - detect_jacks(codec, ARRAY_SIZE(spec->autocfg.hp_pins), > - spec->autocfg.hp_pins); > + spec->hp_jack_present = detect_jacks(codec, num_pins, pins); > if (!spec->detect_hp || (!spec->automute_speaker && !spec->automute_lo)) > return; > call_update_outputs(codec); > -- > 1.8.1.1 >

2 1

[alsa-devel] [PATCH 33/33] ASoC: Convert to devm_ioremap_resource()
by Thierry Reding 22 Jan '13

22 Jan '13

Convert all uses of devm_request_and_ioremap() to the newly introduced devm_ioremap_resource() which provides more consistent error handling. devm_ioremap_resource() provides its own error messages so all explicit error messages can be removed from the failure code paths. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: alsa-devel(a)alsa-project.org --- sound/soc/cirrus/ep93xx-ac97.c | 7 ++++--- sound/soc/cirrus/ep93xx-i2s.c | 6 +++--- sound/soc/codecs/jz4740.c | 6 +++--- sound/soc/fsl/imx-audmux.c | 6 +++--- sound/soc/fsl/imx-ssi.c | 7 +++---- sound/soc/kirkwood/kirkwood-i2s.c | 8 +++----- sound/soc/mxs/mxs-saif.c | 8 +++----- sound/soc/pxa/mmp-sspa.c | 6 +++--- 8 files changed, 25 insertions(+), 29 deletions(-) diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index f3f50e6..1738d28 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -11,6 +11,7 @@ */ #include <linux/delay.h> +#include <linux/err.h> #include <linux/io.h> #include <linux/init.h> #include <linux/module.h> @@ -367,9 +368,9 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) if (!res) return -ENODEV; - info->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!info->regs) - return -ENXIO; + info->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(info->regs)) + return PTR_ERR(info->regs); irq = platform_get_irq(pdev, 0); if (!irq) diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 3365d4e..323ed69 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -380,9 +380,9 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) if (!res) return -ENODEV; - info->regs = devm_request_and_ioremap(&pdev->dev, res); - if (!info->regs) - return -ENXIO; + info->regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(info->regs)) + return PTR_ERR(info->regs); info->mclk = clk_get(&pdev->dev, "mclk"); if (IS_ERR(info->mclk)) { diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index d991529..5f607b3 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -361,9 +361,9 @@ static int jz4740_codec_probe(struct platform_device *pdev) return -ENOMEM; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_request_and_ioremap(&pdev->dev, mem); - if (!base) - return -EBUSY; + base = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(base)) + return PTR_ERR(base); jz4740_codec->regmap = devm_regmap_init_mmio(&pdev->dev, base, &jz4740_codec_regmap_config); diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 251f4d9..c21ac9c 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -252,9 +252,9 @@ static int imx_audmux_probe(struct platform_device *pdev) of_match_device(imx_audmux_dt_ids, &pdev->dev); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - audmux_base = devm_request_and_ioremap(&pdev->dev, res); - if (!audmux_base) - return -EADDRNOTAVAIL; + audmux_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(audmux_base)) + return PTR_ERR(audmux_base); pinctrl = devm_pinctrl_get_select_default(&pdev->dev); if (IS_ERR(pinctrl)) { diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 3b48042..55464a5 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -550,10 +550,9 @@ static int imx_ssi_probe(struct platform_device *pdev) goto failed_get_resource; } - ssi->base = devm_request_and_ioremap(&pdev->dev, res); - if (!ssi->base) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENODEV; + ssi->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ssi->base)) { + ret = PTR_ERR(ssi->base); goto failed_register; } diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 282d8b1..c74c890 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -472,11 +472,9 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - priv->io = devm_request_and_ioremap(&pdev->dev, mem); - if (!priv->io) { - dev_err(&pdev->dev, "devm_request_and_ioremap failed\n"); - return -ENOMEM; - } + priv->io = devm_ioremap_resource(&pdev->dev, mem); + if (IS_ERR(priv->io)) + return PTR_ERR(priv->io); priv->irq = platform_get_irq(pdev, 0); if (priv->irq <= 0) { diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 365d9d2..b327709 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -724,11 +724,9 @@ static int mxs_saif_probe(struct platform_device *pdev) iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); - saif->base = devm_request_and_ioremap(&pdev->dev, iores); - if (!saif->base) { - dev_err(&pdev->dev, "ioremap failed\n"); - return -ENODEV; - } + saif->base = devm_ioremap_resource(&pdev->dev, iores); + if (IS_ERR(saif->base)) + return PTR_ERR(saif->base); dmares = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (!dmares) { diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 41c3a09..9140c4a 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -429,9 +429,9 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) if (res == NULL) return -ENOMEM; - priv->sspa->mmio_base = devm_request_and_ioremap(&pdev->dev, res); - if (priv->sspa->mmio_base == NULL) - return -ENODEV; + priv->sspa->mmio_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(priv->sspa->mmio_base)) + return PTR_ERR(priv->sspa->mmio_base); priv->sspa->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(priv->sspa->clk)) -- 1.8.1.1

2 3

[alsa-devel] [PATCH] ASoC: wm_adsp: Release firmware on error
by Charles Keepax 22 Jan '13

22 Jan '13

This patch correctly releases the firmware if the magic string in the firmware header does not match. Change-Id: I2d08f7fff92b2f0e0f2ab1fb937007e3783f815e Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 4196f2d..b6b6548 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -396,7 +396,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp) hdr = (void*)&firmware->data[0]; if (memcmp(hdr->magic, "WMDR", 4) != 0) { adsp_err(dsp, "%s: invalid magic\n", file); - return -EINVAL; + goto out_fw; } adsp_dbg(dsp, "%s: v%d.%d.%d\n", file, -- 1.7.2.5

2 1

[alsa-devel] [PATCH 0/5] ASoC: tegra: Some fixes in codec files
by Sachin Kamat 22 Jan '13

22 Jan '13

Compile tested using tegra_defconfig on the for-next branch of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git Sachin Kamat (5): ASoC: tegra_wm9712: Remove __devinitconst attribute ASoC: tegra20_ac97: Remove __devinitconst attribute ASoC: tegra: Make 'ahub_auxdata' static ASoC: tegra: Use NULL instead of 0 for pointers ASoC: tegra: Staticize some functions in tegra30_i2s.c sound/soc/tegra/tegra20_ac97.c | 2 +- sound/soc/tegra/tegra30_ahub.c | 6 +++--- sound/soc/tegra/tegra30_i2s.c | 4 ++-- sound/soc/tegra/tegra_wm9712.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) -- 1.7.4.1

2 9