April 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] Fix oops caused by recent commit "Fix internal mic for Lenovo Ideapad U300s"
by David Henningsson 10 Apr '12

10 Apr '12

Make sure we don't dereference the "quirk" pointer when it is null. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index cbe115b..abb59f4 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -4441,7 +4441,9 @@ static void apply_fixup(struct hda_codec *codec, struct conexant_spec *spec = codec->spec; quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk); - if (quirk && table[quirk->value]) { + if (!quirk) + return; + if (table[quirk->value]) { snd_printdd(KERN_INFO "hda_codec: applying pincfg for %s\n", quirk->name); apply_pincfg(codec, table[quirk->value]); -- 1.7.9.1

2 1

Re: [alsa-devel] [PATCH] alsa: hide HDMI/ELD printks unless in debug kernels
by Takashi Iwai 10 Apr '12

10 Apr '12

At Mon, 09 Apr 2012 09:12:44 -0600, Stephen Warren wrote: > > On 04/08/2012 08:15 PM, Fengguang Wu wrote: > > These trivial messages will show up repeatedly on hot plug as well as > > video mode changes, which could be annoying. > > > > Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> > > Those messages are very useful for end-users to diagnose problems with > HDMI audio. Is there a way to make the messages dynamic, so users can > get them if they want, without recompiling their kernel? We can define a new macro like below, add call like _snd_printd(2, ....) instead of snd_printd(). (Yes, the number 2 can be replaced better in an enum, too.) In future, we should move to the standard dynamic_printk, but a patch like this would be a good compromise for merging to 3.4 kernel, IMO. Takashi --- diff --git a/include/sound/core.h b/include/sound/core.h index b6e0f57..442f822 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -354,6 +354,8 @@ void __snd_printk(unsigned int level, const char *file, int line, */ #define snd_printd(fmt, args...) \ __snd_printk(1, __FILE__, __LINE__, fmt, ##args) +#define _snd_printd(level, fmt, args...) \ + __snd_printk(level, __FILE__, __LINE__, fmt, ##args) /** * snd_BUG - give a BUG warning message and stack trace @@ -383,6 +385,7 @@ void __snd_printk(unsigned int level, const char *file, int line, #else /* !CONFIG_SND_DEBUG */ #define snd_printd(fmt, args...) do { } while (0) +#define _snd_printd(level, fmt, args...) do { } while (0) #define snd_BUG() do { } while (0) static inline int __snd_bug_on(int cond) {

2 2

[alsa-devel] [PATCH 24/26] ASoC: wm8994: Don't test for NULL before release_firmware()
by Jesper Juhl 10 Apr '12

10 Apr '12

release_firmware() does its own NULL ptr testing, it's redundant to also test before calling it. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/soc/codecs/wm8994.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 7c49642..cf7e5d2 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3972,7 +3972,7 @@ err_irq: return ret; } -static int wm8994_codec_remove(struct snd_soc_codec *codec) +static int wm8994_codec_remove(struct snd_soc_codec *codec) { struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994 *control = wm8994->wm8994; @@ -4013,14 +4013,10 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) free_irq(wm8994->micdet_irq, wm8994); break; } - if (wm8994->mbc) - release_firmware(wm8994->mbc); - if (wm8994->mbc_vss) - release_firmware(wm8994->mbc_vss); - if (wm8994->enh_eq) - release_firmware(wm8994->enh_eq); + release_firmware(wm8994->mbc); + release_firmware(wm8994->mbc_vss); + release_firmware(wm8994->enh_eq); kfree(wm8994->retune_mobile_texts); - return 0; } -- 1.7.10 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

2 1

Re: [alsa-devel] ALSA: hda - Fix internal mic for Lenovo Ideapad U300s
by Dan Carpenter 10 Apr '12

10 Apr '12

Hello David Henningsson, This is a semi-automatic email about new static checker warnings. The patch 18dcd3044e4c: "ALSA: hda - Fix internal mic for Lenovo Ideapad U300s" from Apr 2, 2012, leads to the following Smatch complaint: sound/pci/hda/patch_conexant.c:4449 apply_fixup() error: we previously assumed 'quirk' could be null (see line 4444) sound/pci/hda/patch_conexant.c 4443 quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk); 4444 if (quirk && table[quirk->value]) { ^^^^^ Old check. 4445 snd_printdd(KERN_INFO "hda_codec: applying pincfg for %s\n", 4446 quirk->name); 4447 apply_pincfg(codec, table[quirk->value]); 4448 } 4449 if (quirk->value == CXT_FIXUP_STEREO_DMIC) { ^^^^^^^^^^^^ New unchecked dereference. 4450 snd_printdd(KERN_INFO "hda_codec: applying internal mic workaround for %s\n", 4451 quirk->name); regards, dan carpenter

2 1

Re: [alsa-devel] [PATCH][Trivial] Delete trailing whitespace from sound/soc/codecs/wm8994.c
by Jesper Juhl 10 Apr '12

10 Apr '12

On Mon, 9 Apr 2012, Mark Brown wrote: > On Mon, Apr 09, 2012 at 12:40:32AM +0200, Jesper Juhl wrote: > > While reading through sound/soc/codecs/wm8994.c I noticed a fair > > amount of trailing whitespace. This patch gets rid of it. > > Please try to make sure your changelog lines up with the subsysetem - > this is especially important with trivial patches. > Arrgh, sorry about that. I always forget (although not intentionally) to check if there's some special convention for a given subsystem :-( I guess this would have been better: ASoC: wm8994: Delete trailing whitespace -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

2 1

[alsa-devel] [PATCH 23/26] ALSA: riptide: remove redundant NULL test before release_firmware()
by Jesper Juhl 10 Apr '12

10 Apr '12

release_firmware() deals gracefully with NULL pointers, no need to check first. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/pci/riptide/riptide.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c index 0481d94..cbeb3f7 100644 --- a/sound/pci/riptide/riptide.c +++ b/sound/pci/riptide/riptide.c @@ -1837,8 +1837,7 @@ static int snd_riptide_free(struct snd_riptide *chip) } if (chip->irq >= 0) free_irq(chip->irq, chip); - if (chip->fw_entry) - release_firmware(chip->fw_entry); + release_firmware(chip->fw_entry); release_and_free_resource(chip->res_port); kfree(chip); return 0; -- 1.7.10 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

2 1

Re: [alsa-devel] [PATCH] sound/isa/sscape.c: add missing resource-release code
by Takashi Iwai 10 Apr '12

10 Apr '12

At Mon, 9 Apr 2012 10:16:35 +0200, Julia Lawall wrote: > > From: Julia Lawall <Julia.Lawall(a)lip6.fr> > > At the point of this error-handling code, both regions and the dma have > been allocated, so free it as done in previous and subsequent > error-handling code. > > Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> Applied now. Thanks. Takashi > > --- > sound/isa/sscape.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c > index b4a6aa9..131dd98 100644 > --- a/sound/isa/sscape.c > +++ b/sound/isa/sscape.c > @@ -1019,13 +1019,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card) > irq_cfg = get_irq_config(sscape->type, irq[dev]); > if (irq_cfg == INVALID_IRQ) { > snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", irq[dev]); > - return -ENXIO; > + err = -ENXIO; > + goto _release_dma; > } > > mpu_irq_cfg = get_irq_config(sscape->type, mpu_irq[dev]); > if (mpu_irq_cfg == INVALID_IRQ) { > snd_printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]); > - return -ENXIO; > + err = -ENXIO; > + goto _release_dma; > } > > /* >

1 0

Re: [alsa-devel] [PATCH] sound/oss/msnd_pinnacle.c: add vfrees
by Takashi Iwai 10 Apr '12

10 Apr '12

At Mon, 9 Apr 2012 10:16:32 +0200, Julia Lawall wrote: > > From: Julia Lawall <Julia.Lawall(a)lip6.fr> > > At the point of this error-handling code, HAVE_DSPCODEH may be undefined, > so free INITCODE and PERMCODE as done elsewhere. A jump and label are > introduced to avoid code duplication. > > Signed-off-by: Julia Lawall <Julia.Lawall(a)lip6.fr> Thanks, applied now. Takashi > > --- > sound/oss/msnd_pinnacle.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c > index 2c79d60..536c4c0 100644 > --- a/sound/oss/msnd_pinnacle.c > +++ b/sound/oss/msnd_pinnacle.c > @@ -1294,6 +1294,8 @@ static int __init calibrate_adc(WORD srate) > > static int upload_dsp_code(void) > { > + int ret = 0; > + > msnd_outb(HPBLKSEL_0, dev.io + HP_BLKS); > #ifndef HAVE_DSPCODEH > INITCODESIZE = mod_firmware_load(INITCODEFILE, &INITCODE); > @@ -1312,7 +1314,8 @@ static int upload_dsp_code(void) > memcpy_toio(dev.base, PERMCODE, PERMCODESIZE); > if (msnd_upload_host(&dev, INITCODE, INITCODESIZE) < 0) { > printk(KERN_WARNING LOGNAME ": Error uploading to DSP\n"); > - return -ENODEV; > + ret = -ENODEV; > + goto out; > } > #ifdef HAVE_DSPCODEH > printk(KERN_INFO LOGNAME ": DSP firmware uploaded (resident)\n"); > @@ -1320,12 +1323,13 @@ static int upload_dsp_code(void) > printk(KERN_INFO LOGNAME ": DSP firmware uploaded\n"); > #endif > > +out: > #ifndef HAVE_DSPCODEH > vfree(INITCODE); > vfree(PERMCODE); > #endif > > - return 0; > + return ret; > } > > #ifdef MSND_CLASSIC >

1 0

[alsa-devel] [PATCH][Trivial] Delete trailing whitespace from sound/soc/codecs/wm8994.c
by Jesper Juhl 09 Apr '12

09 Apr '12

While reading through sound/soc/codecs/wm8994.c I noticed a fair amount of trailing whitespace. This patch gets rid of it. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- sound/soc/codecs/wm8994.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 7c49642..c6c2cb2 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -398,7 +398,7 @@ static void wm8994_set_retune_mobile(struct snd_soc_codec *codec, int block) wm8994->dac_rates[iface]); /* The EQ will be disabled while reconfiguring it, remember the - * current configuration. + * current configuration. */ save = snd_soc_read(codec, base); save &= WM8994_AIF1DAC1_EQ_ENA; @@ -991,7 +991,7 @@ static void wm8994_update_class_w(struct snd_soc_codec *codec) WM8994_CP_DYN_SRC_SEL_MASK, source | WM8994_CP_DYN_PWR); wm8994->hubs.class_w = true; - + } else { dev_dbg(codec->dev, "Class W disabled\n"); snd_soc_update_bits(codec, WM8994_CLASS_W_1, @@ -1358,7 +1358,7 @@ static const struct snd_kcontrol_new wm8958_aif3adc_mux = SOC_DAPM_ENUM("AIF3ADC Mux", wm8958_aif3adc_enum); static const char *mono_pcm_out_text[] = { - "None", "AIF2ADCL", "AIF2ADCR", + "None", "AIF2ADCL", "AIF2ADCR", }; static const struct soc_enum mono_pcm_out_enum = @@ -2122,7 +2122,7 @@ static int wm8994_set_dai_sysclk(struct snd_soc_dai *dai, case WM8994_SYSCLK_OPCLK: /* Special case - a division (times 10) is given and - * no effect on main clocking. + * no effect on main clocking. */ if (freq) { for (i = 0; i < ARRAY_SIZE(opclk_divs); i++) @@ -2958,14 +2958,14 @@ static void wm8994_handle_retune_mobile_pdata(struct wm8994_priv *wm8994) /* Expand the array... */ t = krealloc(wm8994->retune_mobile_texts, - sizeof(char *) * + sizeof(char *) * (wm8994->num_retune_mobile_texts + 1), GFP_KERNEL); if (t == NULL) continue; /* ...store the new entry... */ - t[wm8994->num_retune_mobile_texts] = + t[wm8994->num_retune_mobile_texts] = pdata->retune_mobile_cfgs[i].name; /* ...and remember the new version. */ @@ -3907,7 +3907,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ARRAY_SIZE(wm8994_dac_widgets)); break; } - wm_hubs_add_analogue_routes(codec, 0, 0); snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon)); -- 1.7.10 -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/jargon/html/T/top-post.html Plain text mails only, please.

3 5

[alsa-devel] [RFC 1/2] snd-usb-audio: Skip un-parseable mixer units instead of erroring
by Mark Hills 09 Apr '12

09 Apr '12

Some interfaces reference endpoints which do not exists. To accomodate these, do not fail completely, but skip over them. This allows the Electrix Ebox-44 with earlier firmware to be detected and used for audio. Signed-off-by: Mark Hills <mark(a)pogo.org.uk> --- sound/usb/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ab23869..c374c72 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1388,7 +1388,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r for (pin = 0; pin < input_pins; pin++) { err = parse_audio_unit(state, desc->baSourceID[pin]); if (err < 0) - return err; + continue; err = check_input_term(state, desc->baSourceID[pin], &iterm); if (err < 0) return err; -- 1.7.4.4

1 1