October 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [patch 1/2] OSS: soundcard: locking bug in sound_ioctl()
by Dan Carpenter 11 Oct '10

11 Oct '10

We shouldn't return directly here because we're still holding the &soundcard_mutex. This bug goes all the way back to the start of git. It's strange that no one has complained about it as a runtime bug. CC: stable(a)kernel.org Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 938ed94..a5ab61e 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -392,11 +392,11 @@ static long sound_ioctl(struct file *file, unsigned int cmd, unsigned long arg) case SND_DEV_DSP: case SND_DEV_DSP16: case SND_DEV_AUDIO: - return audio_ioctl(dev, file, cmd, p); + ret = audio_ioctl(dev, file, cmd, p); break; case SND_DEV_MIDIN: - return MIDIbuf_ioctl(dev, file, cmd, p); + ret = MIDIbuf_ioctl(dev, file, cmd, p); break; }

4 6

[alsa-devel] ASoC updates for 2.6.37
by Mark Brown 11 Oct '10

11 Oct '10

The following changes since commit ad5e4655f9a920b1cc13972e0389eaf9e0ba10b3: ASoC: remove duplicated include for nuc900 (2010-10-05 19:26:00 -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.37 Mark Brown (6): ASoC: Add Dimitris Papastamos to Wolfson maintainers ASoC: Update links for Wolfson MAINTAINERS entry ASoC: Staticise AD1980 DAI ASoC: Use delayed work for debounce of GPIO based jacks ASoC: Staticise CS4270 DAI Merge branch 'for-2.6.36' into for-2.6.37 MAINTAINERS | 4 +++- include/sound/soc.h | 2 +- sound/soc/codecs/ad1980.c | 2 +- sound/soc/codecs/cs4270.c | 2 +- sound/soc/soc-jack.c | 11 +++++------ 5 files changed, 11 insertions(+), 10 deletions(-)

2 1

[alsa-devel] ASoC updates for 2.6.36
by Mark Brown 11 Oct '10

11 Oct '10

The following changes since commit 0077ca0b5c986477e33451b797b6e7dc92a8bbc0: ASoC: Fix multi-componentism (2010-09-22 18:47:40 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.36 Just a few MAINTAINERS updates. Mark Brown (3): ASoC: Add Jassi Brar as Samsung maintainer ASoC: Add Dimitris Papastamos to Wolfson maintainers ASoC: Update links for Wolfson MAINTAINERS entry MAINTAINERS | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)

2 1

[alsa-devel] [patch] ASoC: checking kzalloc() for IS_ERR() instead of NULL
by Dan Carpenter 11 Oct '10

11 Oct '10

There is a typo here that got copy and pasted to several probe functions. kzalloc() returns NULL on allocation failures and not an ERR_PTR. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 642b07c..4599e8e 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -720,8 +720,8 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi) int ret; wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); - if (IS_ERR(wm8804)) - return PTR_ERR(wm8804); + if (!wm8804) + return -ENOMEM; wm8804->control_type = SND_SOC_SPI; spi_set_drvdata(spi, wm8804); @@ -758,8 +758,8 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, int ret; wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL); - if (IS_ERR(wm8804)) - return PTR_ERR(wm8804); + if (!wm8804) + return -ENOMEM; wm8804->control_type = SND_SOC_I2C; i2c_set_clientdata(i2c, wm8804); diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index ae9020a..fd2e7cc 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1079,8 +1079,8 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) int ret; wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL); - if (IS_ERR(wm8985)) - return PTR_ERR(wm8985); + if (!wm8985) + return -ENOMEM; wm8985->control_type = SND_SOC_SPI; spi_set_drvdata(spi, wm8985); @@ -1117,8 +1117,8 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, int ret; wm8985 = kzalloc(sizeof *wm8985, GFP_KERNEL); - if (IS_ERR(wm8985)) - return PTR_ERR(wm8985); + if (!wm8985) + return -ENOMEM; wm8985->control_type = SND_SOC_I2C; i2c_set_clientdata(i2c, wm8985);

4 3

[alsa-devel] RME HDSP9632, mute headphones
by Matthew Robbetts 11 Oct '10

11 Oct '10

Hi all, I've just acquired myself a HDSP9632 and noticed what I think is a missing feature from the drivers (compared to Windows, at least): the ability to set the headphones to "mute", in addition to -6dB and -12dB of gain. I would find this feature useful. Is there a reason it is missing or has it just been overlooked? Or, alternatively, am I doing something stupid? I'm using the alsa that comes with kernel 2.6.36-rc5 (I think it is 1.0.21?). Thanks a lot, Matt

2 2

[PATCH] ALSA: hda: Add speaker pin to automute Acer Aspire 8943G
by Daniel T Chen 11 Oct '10

11 Oct '10

BugLink: https://bugs.launchpad.net/bugs/656625 Add clause for handling Acer Aspire 8943G's subwoofer as additional speaker pin for automuting. Reported-by: RussianNeuroMancer Cc: stable(a)kernel.org Signed-off-by: Daniel T Chen <crimsun(a)ubuntu.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b4e0959..c41ac30 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -19233,10 +19233,17 @@ static void alc662_auto_init(struct hda_codec *codec) } enum { + ALC662_FIXUP_ASPIRE, ALC662_FIXUP_IDEAPAD, }; static const struct alc_fixup alc662_fixups[] = { + [ALC662_FIXUP_ASPIRE] = { + .pins = (const struct alc_pincfg[]) { + { 0x15, 0x99130112 }, /* subwoofer */ + { } + } + }, [ALC662_FIXUP_IDEAPAD] = { .pins = (const struct alc_pincfg[]) { { 0x17, 0x99130112 }, /* subwoofer */ @@ -19246,6 +19253,7 @@ static const struct alc_fixup alc662_fixups[] = { }; static struct snd_pci_quirk alc662_fixup_tbl[] = { + SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), {} -- 1.7.0.4 --------------050408050300090409070003--

1 0

[alsa-devel] [PATCHv2 0/4] ASoC AC97 audio support for ep93xx
by Mika Westerberg 10 Oct '10

10 Oct '10

Hello, This series adds AC97 audio support for Cirrus Logic EP93xx family SoCs. Example machine driver is for Simplemachines Sim.One (which is the only hardware that I have which has AC97 codec). The first patch is a bugfix for the DMA code. Without the patch audio DMA transfers may corrupt if playing application is killed while playing. This results weird noise playback when application is started again. I would like Ryan Mallon to confirm that this is indeed correct fix and if possible to check that I2S transfers still work after this patch is applied. Please review. Changes to previous revision: - patches are taken from the correct branch so they should apply on top of latest mainline - increased cold reset sleep time Thanks, MW Mika Westerberg (4): ARM: ep93xx: DMA: fix channel_disable ASoC: add ep93xx AC97 audio driver ARM: ep93xx: add AC97 platform support ASoC: ep93xx: add Simplemachines Sim.One AC97 audio support arch/arm/mach-ep93xx/core.c | 32 ++ arch/arm/mach-ep93xx/dma-m2p.c | 2 +- arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + arch/arm/mach-ep93xx/simone.c | 1 + sound/soc/ep93xx/Kconfig | 17 +- sound/soc/ep93xx/Makefile | 4 + sound/soc/ep93xx/ep93xx-ac97.c | 476 +++++++++++++++++++++++ sound/soc/ep93xx/ep93xx-ac97.h | 17 + sound/soc/ep93xx/simone.c | 80 ++++ 10 files changed, 629 insertions(+), 2 deletions(-) create mode 100644 sound/soc/ep93xx/ep93xx-ac97.c create mode 100644 sound/soc/ep93xx/ep93xx-ac97.h create mode 100644 sound/soc/ep93xx/simone.c

1 4

[alsa-devel] Setting Input Source
by Chandrashekhar 10 Oct '10

10 Oct '10

Hi, I wanted to set my input sources and control volume through the mixer api from a 'C' code. I am required to do this without using alsa utils. Please guide me as to how I can set my input source to say 'Mic' and also adjust say Front Right channel volume. It would also be nice if there was a mini tutorial on the alsa page which explains how to do this basic stuff. Thanks and Regards, Chandrashekhar

1 0

[alsa-devel] [PATCH] alsaucm: Report failure to set a device due to missing verb setup
by Mark Brown 10 Oct '10

10 Oct '10

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- alsaucm/usecase.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/alsaucm/usecase.c b/alsaucm/usecase.c index 2db26f1..d1420c0 100644 --- a/alsaucm/usecase.c +++ b/alsaucm/usecase.c @@ -94,8 +94,10 @@ static int list_verb_device_status(snd_use_case_mgr_t *uc_mgr) int i, enabled, num; verb = snd_use_case_get_verb(uc_mgr); - if (verb == NULL) + if (verb == NULL) { + printf(" no verb currently enabled.\n"); return -ENODEV; + } num = snd_use_case_get_device_list(uc_mgr, verb, &device_list); if (num <= 0) { -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Use delayed work for debounce of GPIO based jacks
by Mark Brown 10 Oct '10

10 Oct '10

Rather than block the workqueue by sleeping to do the debounce use delayed work to implement the debounce time. This should also mean that we extend the debounce time on each new bounce, potentially allowing shorter debounce times for clean insertions. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- This is completely untested as I do not have any systems to hand which can make use of this functionality but I believe it should work - I've CCed a couple of the OMAP people since they seem to be the main users. include/sound/soc.h | 2 +- sound/soc/soc-jack.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 493b3a4..4fb079e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -385,7 +385,7 @@ struct snd_soc_jack_gpio { int invert; int debounce_time; struct snd_soc_jack *jack; - struct work_struct work; + struct delayed_work work; int (*jack_status_check)(void); }; diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 8862770..8a0a920 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -188,9 +188,6 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio) int enable; int report; - if (gpio->debounce_time > 0) - mdelay(gpio->debounce_time); - enable = gpio_get_value(gpio->gpio); if (gpio->invert) enable = !enable; @@ -211,7 +208,8 @@ static irqreturn_t gpio_handler(int irq, void *data) { struct snd_soc_jack_gpio *gpio = data; - schedule_work(&gpio->work); + schedule_delayed_work(&gpio->work, + msecs_to_jiffies(gpio->debounce_time)); return IRQ_HANDLED; } @@ -221,7 +219,7 @@ static void gpio_work(struct work_struct *work) { struct snd_soc_jack_gpio *gpio; - gpio = container_of(work, struct snd_soc_jack_gpio, work); + gpio = container_of(work, struct snd_soc_jack_gpio, work.work); snd_soc_jack_gpio_detect(gpio); } @@ -262,7 +260,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, if (ret) goto err; - INIT_WORK(&gpios[i].work, gpio_work); + INIT_DELAYED_WORK(&gpios[i].work, gpio_work); gpios[i].jack = jack; ret = request_irq(gpio_to_irq(gpios[i].gpio), @@ -312,6 +310,7 @@ void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count, gpio_unexport(gpios[i].gpio); #endif free_irq(gpio_to_irq(gpios[i].gpio), &gpios[i]); + cancel_delayed_work_sync(&gpios[i].work); gpio_free(gpios[i].gpio); gpios[i].jack = NULL; } -- 1.7.1

3 3