June 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] alsaucm: Add list1 command for non-tuple lists
by Stephen Warren 03 Jun '11

03 Jun '11

snd_use_case_get_list returns lists of strings that are either: a) A sequence of single strings b) A sequence of pairs of strings all flattened into a single list The current list command assumes layout (b) above, and hence prints nothing when printing a single-entry list that's actually in layout (a). Add a new command "list1" to dump lists in layout (a). Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- alsaucm/usecase.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/alsaucm/usecase.c b/alsaucm/usecase.c index 83781d0..f24e63e 100644 --- a/alsaucm/usecase.c +++ b/alsaucm/usecase.c @@ -63,7 +63,8 @@ enum uc_cmd { OM_RESET, OM_RELOAD, OM_LISTCARDS, - OM_LIST, + OM_LIST2, + OM_LIST1, /* set/get */ OM_SET, @@ -87,7 +88,8 @@ static struct cmd cmds[] = { { OM_RESET, 0, 1, "reset" }, { OM_RELOAD, 0, 1, "reload" }, { OM_LISTCARDS, 0, 0, "listcards" }, - { OM_LIST, 1, 1, "list" }, + { OM_LIST1, 1, 1, "list1" }, + { OM_LIST2, 1, 1, "list" }, { OM_SET, 2, 1, "set" }, { OM_GET, 1, 1, "get" }, { OM_GETI, 1, 1, "geti" }, @@ -172,7 +174,7 @@ static int do_one(struct context *context, struct cmd *cmd, char **argv) { const char **list, *str; long lval; - int err, i; + int err, i, j, entries; if (cmd->opencard && context->uc_mgr == NULL) { fprintf(stderr, "%s: command '%s' requires an open card\n", @@ -233,7 +235,17 @@ static int do_one(struct context *context, struct cmd *cmd, char **argv) } snd_use_case_free_list(list, err); break; - case OM_LIST: + case OM_LIST1: + case OM_LIST2: + switch (cmd->code) { + case OM_LIST1: + entries = 1; + break; + case OM_LIST2: + entries = 2; + break; + } + err = snd_use_case_get_list(context->uc_mgr, argv[0], &list); @@ -246,10 +258,11 @@ static int do_one(struct context *context, struct cmd *cmd, char **argv) } if (err == 0) printf(" list is empty\n"); - for (i = 0; i < err / 2; i++) { - printf(" %i: %s\n", i, list[i*2]); - if (list[i*2+1]) - printf(" %s\n", list[i*2+1]); + for (i = 0; i < err / entries; i++) { + printf(" %i: %s\n", i, list[i*entries]); + for (j = 0; j < entries - 1; j++) + if (list[i*entries+j+1]) + printf(" %s\n", list[i*entries+j+1]); } snd_use_case_free_list(list, err); break; -- 1.7.0.4

2 2

[alsa-devel] [Trivial PATCH 0/5] treewide: Use angle brackets for system includes
by Joe Perches 03 Jun '11

03 Jun '11

Just neatening. Joe Perches (5): drbd: Use angle brackets for system includes drm: Use angle brackets for system includes aix94xx: Use angle brackets for system includes ALSA: asihpi: Use angle brackets for system includes staging: msm: Use angle brackets for system includes drivers/block/drbd/drbd_int.h | 2 +- drivers/block/drbd/drbd_nl.c | 4 ++-- drivers/gpu/drm/drm_ioctl.c | 2 +- drivers/gpu/drm/i915/i915_gem_tiling.c | 4 ++-- drivers/gpu/drm/nouveau/nouveau_drv.h | 10 +++++----- drivers/gpu/drm/ttm/ttm_agp_backend.c | 6 +++--- drivers/gpu/drm/ttm/ttm_bo.c | 6 +++--- drivers/gpu/drm/ttm/ttm_bo_manager.c | 6 +++--- drivers/gpu/drm/ttm/ttm_bo_util.c | 4 ++-- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +++--- drivers/gpu/drm/ttm/ttm_lock.c | 4 ++-- drivers/gpu/drm/ttm/ttm_memory.c | 6 +++--- drivers/gpu/drm/ttm/ttm_module.c | 2 +- drivers/gpu/drm/ttm/ttm_object.c | 4 ++-- drivers/gpu/drm/ttm/ttm_page_alloc.c | 4 ++-- drivers/gpu/drm/ttm/ttm_tt.c | 8 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 ++++---- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 12 ++++++------ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 6 +++--- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 ++-- drivers/scsi/aic94xx/aic94xx_dump.c | 2 +- drivers/staging/msm/ebi2_l2f.c | 2 +- drivers/staging/msm/ebi2_tmd20.c | 2 +- drivers/staging/msm/mddihost.h | 2 +- drivers/staging/msm/mdp_ppp.c | 2 +- drivers/staging/msm/mdp_ppp_v20.c | 2 +- drivers/staging/msm/mdp_ppp_v31.c | 2 +- drivers/staging/msm/msm_fb.h | 2 +- include/drm/ttm/ttm_bo_driver.h | 12 ++++++------ include/drm/ttm/ttm_execbuf_util.h | 2 +- include/drm/ttm/ttm_lock.h | 2 +- include/linux/drbd_tag_magic.h | 2 +- sound/pci/asihpi/hpidspcd.c | 2 +- 39 files changed, 80 insertions(+), 80 deletions(-) -- 1.7.5.rc3.dirty

2 2

[alsa-devel] [PATCH] asoc atmel_ssc: Don't try to free ssc if request failed
by Joachim Eastwood 03 Jun '11

03 Jun '11

Hello, Patch below fixes a segmentation fault in atmel_ssc_dai if ssc_request() fails. We should only call ssc_free() when ssc_request() succeeds or bad things will happen. Signed-off-by: Joachim Eastwood <joachim.eastwood(a)jotron.com> --- sound/soc/atmel/atmel_ssc_dai.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 7fbfa05..eda955b 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -848,9 +848,10 @@ int atmel_ssc_set_audio(int ssc_id) if (IS_ERR(ssc)) pr_warn("Unable to parent ASoC SSC DAI on SSC: %ld\n", PTR_ERR(ssc)); - else + else { ssc_pdev->dev.parent = &(ssc->pdev->dev); - ssc_free(ssc); + ssc_free(ssc); + } ret = platform_device_add(ssc_pdev); if (ret < 0) -- 1.7.5.2

3 3

[alsa-devel] [patch] ALSA: fm801: add error handling if auto-detect fails
by Dan Carpenter 03 Jun '11

03 Jun '11

In the original code if auto detect failed and tea575x_tuner == 4 then we copy bogus information to chip->tea.card. I've changed the autodetect code to cleanup and return -ENODEV on error instead. I made the previous chunk return on error as well. Potentially the hardware should limp along without the radio? I don't know this hardware well enough to say. Signed-off-by: Dan Carpenter <error27(a)gmail.com> --- Compile tested only. diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index eacd490..a7ec703 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1234,9 +1234,12 @@ static int __devinit snd_fm801_create(struct snd_card *card, sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci)); if ((tea575x_tuner & TUNER_TYPE_MASK) > 0 && (tea575x_tuner & TUNER_TYPE_MASK) < 4) { - if (snd_tea575x_init(&chip->tea)) + if (snd_tea575x_init(&chip->tea)) { snd_printk(KERN_ERR "TEA575x radio not found\n"); - } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) + snd_fm801_free(chip); + return -ENODEV; + } + } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) { /* autodetect tuner connection */ for (tea575x_tuner = 1; tea575x_tuner <= 3; tea575x_tuner++) { chip->tea575x_tuner = tea575x_tuner; @@ -1246,6 +1249,12 @@ static int __devinit snd_fm801_create(struct snd_card *card, break; } } + if (tea575x_tuner == 4) { + snd_printk(KERN_ERR "TEA575x radio not found\n"); + snd_fm801_free(chip); + return -ENODEV; + } + } strlcpy(chip->tea.card, snd_fm801_tea575x_gpios[(tea575x_tuner & TUNER_TYPE_MASK) - 1].name, sizeof(chip->tea.card)); #endif

2 1

[alsa-devel] [PATCH ALSA HDA 1/2] Fix HP pin and Front pin of ad1988/ad1989 in ad198x_eapd_powerdown
by Raymond Yau 03 Jun '11

03 Jun '11

Refer to commit ea52bf260ecbb175339af3178c15788df21b7516 1) Fix HP pin and Front pin of ad1988/ad1989 in ad198x_eapd_powerdown According to ad1988a/ad1988b datasheet, Port A (0x11) is HP and Port D (0x12) is Front but both of these pins in ad1988a are not EAPD capable 2) Check pin support EAPD in ad198x_power_eapd_write

2 1

[alsa-devel] [PATCH] Sound, 6fire: Don't leak firmware in error path
by Jesper Juhl 03 Jun '11

03 Jun '11

One of the error paths in sound/usb/6fire/firmware.c::usb6fire_fw_ezusb_upload() neglects to free the memory allocated for the firmware before returning, thus leaking the memory. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- firmware.c | 1 + 1 file changed, 1 insertion(+) patch against 3.0-rc1 compile tested only diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c index d47beff..a91719d 100644 --- a/sound/usb/6fire/firmware.c +++ b/sound/usb/6fire/firmware.c @@ -227,6 +227,7 @@ static int usb6fire_fw_ezusb_upload( ret = usb6fire_fw_ihex_init(fw, rec); if (ret < 0) { kfree(rec); + release_firmware(fw); snd_printk(KERN_ERR PREFIX "error validating ezusb " "firmware %s.\n", fwname); return ret; -- 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 1/2] UCM: Fix typo in error message
by Stephen Warren 03 Jun '11

03 Jun '11

parse_name_is_safe disallows dots in the name, so not is the correct word to use Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- src/ucm/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index 38fdba0..f7de9bd 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -62,7 +62,7 @@ int parse_string(snd_config_t *n, char **res) int parse_is_name_safe(char *name) { if (strchr(name, '.')) { - uc_error("char '.' now allowed in '%s'", name); + uc_error("char '.' not allowed in '%s'", name); return 0; } return 1; -- 1.7.0.4

1 1

[alsa-devel] ASoC updates for 3.1
by Mark Brown 02 Jun '11

02 Jun '11

The following changes since commit 55922c9d1b84b89cb946c777fddccb3247e7df2c: Linux 3.0-rc1 (2011-05-29 17:43:36 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.41 Axel Lin (1): ASoC: Remove redundant freq assignment for max98095->sysclk/max98088->sysclk Ben Gardiner (7): ASoC: davinci-pcm: trivial: make ping-pong params setup symmetrical ASoC: davinci-pcm: expand the .formats ASoC: davinci-pcm: increase the maximum channels ASoC: davinci-pcm: fix audible glitch on 2nd ping-pong playback ASoC: davinci-pcm: extract period elapsed functions ASoC: davinci-pcm: convert to BATCH mode ASoC: davinci-pcm: comments for the conversion to BATCH mode Daniel Mack (1): ASoC: Fix comment in cs4270 codec driver Dimitris Papastamos (2): ASoC: soc-cache: Block based rbtree compression ASoC: soc-cache: Cache a pointer to the last accessed rbnode Kuninori Morimoto (9): ASoC: sh: fsi: tidyup parameter of fsi_stream_push ASoC: sh: fsi: add fsi_set_master_clk ASoC: sh: fsi: irq control moves to fsi_port_start/stop ASoC: sh: fsi: tidyup unclear variable naming ASoC: sh: fsi: remove pm_runtime from fsi_dai_set_fmt. ASoC: sh: fsi: make sure fsi_stream_push/pop access by spin lock ASoC: sh: fsi: remove fsi_module_init/kill ASoC: sh: fsi: cleanup suspend/resume ASoC: sh: fsi: add fsi_hw_startup/shutdown Mark Brown (6): ASoC: Convert 16x16 write to use cpu_to_be16() ASoC: Convert 7x9 write to use cpu_to_be16() ASoC: Use cpu_to_be16() in 8x16 write ASoC: Use explicit endianness conversion in snd_soc_16_8_write() ASoC: Fix wm_hubs input PGA ZC bits Merge branch 'for-2.6.40' into for-2.6.41 Nicolas Ferre (3): ASoC: trivial: typo in debug comment ASoC: trivial: typo in atmel_pcm_dma_params strucutre comment ASoC: atmel_ssc_dai: fix ssc error path Stephen Warren (3): ASoC: core: Don't schedule deferred_resume_work twice ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared ASoC: Tegra: Enable Kaen HP_MUTE at boot sound/soc/atmel/atmel-pcm.c | 2 +- sound/soc/atmel/atmel-pcm.h | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 4 +- sound/soc/codecs/cs4270.c | 5 +- sound/soc/codecs/max98088.c | 2 - sound/soc/codecs/max98095.c | 2 - sound/soc/codecs/wm_hubs.c | 8 +- sound/soc/davinci/davinci-pcm.c | 148 ++++++----- sound/soc/sh/fsi.c | 576 ++++++++++++++++++++------------------- sound/soc/soc-cache.c | 294 +++++++++++++++----- sound/soc/soc-core.c | 19 +- sound/soc/soc-dapm.c | 5 +- sound/soc/tegra/tegra_wm8903.c | 2 +- 13 files changed, 629 insertions(+), 440 deletions(-)

2 1

[alsa-devel] ASoC updates for 3.0
by Mark Brown 02 Jun '11

02 Jun '11

The following changes since commit 55922c9d1b84b89cb946c777fddccb3247e7df2c: Linux 3.0-rc1 (2011-05-29 17:43:36 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.40 Mark Brown (1): ASoC: Fix wm_hubs input PGA ZC bits Stephen Warren (1): ASoC: Fix dapm_is_shared_kcontrol so everything isn't shared sound/soc/codecs/wm_hubs.c | 8 ++++---- sound/soc/soc-dapm.c | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-)

2 1

[alsa-devel] [PATCH] ASoC: Use a lower detection rate when monitoring headphones on WM8915
by Mark Brown 02 Jun '11

02 Jun '11

We only need to increase the detection rate to maximum if we're monitoring for button presses as the response times needed for user interaction there are much lower. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8915.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8915.c b/sound/soc/codecs/wm8915.c index 5ff6a77..5a59ef7 100644 --- a/sound/soc/codecs/wm8915.c +++ b/sound/soc/codecs/wm8915.c @@ -2288,6 +2288,12 @@ static void wm8915_micd(struct snd_soc_codec *codec) SND_JACK_HEADSET | SND_JACK_BTN_0); wm8915->jack_mic = true; wm8915->detecting = false; + + /* Increase poll rate to give better responsiveness + * for buttons */ + snd_soc_update_bits(codec, WM8915_MIC_DETECT_1, + WM8915_MICD_RATE_MASK, + 5 << WM8915_MICD_RATE_SHIFT); } /* If we detected a lower impedence during initial startup @@ -2328,15 +2334,17 @@ static void wm8915_micd(struct snd_soc_codec *codec) SND_JACK_HEADPHONE, SND_JACK_HEADSET | SND_JACK_BTN_0); + + /* Increase the detection rate a bit for + * responsiveness. + */ + snd_soc_update_bits(codec, WM8915_MIC_DETECT_1, + WM8915_MICD_RATE_MASK, + 7 << WM8915_MICD_RATE_SHIFT); + wm8915->detecting = false; } } - - /* Increase poll rate to give better responsiveness for buttons */ - if (!wm8915->detecting) - snd_soc_update_bits(codec, WM8915_MIC_DETECT_1, - WM8915_MICD_RATE_MASK, - 5 << WM8915_MICD_RATE_SHIFT); } static irqreturn_t wm8915_irq(int irq, void *data) -- 1.7.5.3

2 1