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

Re: [alsa-devel] [linux-next] ASoC: sound/soc/samsung/neo1973_wm8753.c build failure
by Mark Brown 16 Sep '11

16 Sep '11

On Thu, Sep 15, 2011 at 08:16:30PM +0100, Russell King wrote: > It sounds like you're in the perfect place to send them a warning > that something needs to happen on this, one way or the other. Lars-Peter is the main guy here and he already replied on this thread.

1 0

[alsa-devel] [PATCH] ASoC: Fix WM8996 DC servo operation without IRQ
by Mark Brown 15 Sep '11

15 Sep '11

We need to count the timneout down. Reported-by: Axel Lin <axel.lin(a)gmail.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8996.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 0fed436..5ca9d76 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -719,7 +719,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask) { struct i2c_client *i2c = to_i2c_client(codec->dev); struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); - int i, ret; + int ret; unsigned long timeout = 200; snd_soc_write(codec, WM8996_DC_SERVO_2, mask); @@ -734,15 +734,12 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask) } else { msleep(1); - if (--i) { - timeout = 0; - break; - } + timeout--; } ret = snd_soc_read(codec, WM8996_DC_SERVO_2); dev_dbg(codec->dev, "DC servo state: %x\n", ret); - } while (ret & mask); + } while (timeout && ret & mask); if (timeout == 0) dev_err(codec->dev, "DC servo timed out for %x\n", mask); -- 1.7.6.3

2 1

[alsa-devel] snd_array_free - snd: bad kfree when HDA reconfig
by Raymond Yau 15 Sep '11

15 Sep '11

These errors "snd: bad kfree" occur when reconfig HDA from model "6stack-dig-fp" to "auto" and vice versa Is "HD-Audio reconfiguration" still experimental ? BTW, it seem that HDA Digital PCBeep assigned to different input after each reconfig input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/input/input7 input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/input/input8 input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/input/input9 aplay -l card 1: Intel [HDA Intel], device 0: AD198x Analog [AD198x Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Intel [HDA Intel], device 1: AD198x Digital [AD198x Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Intel [HDA Intel], device 2: AD198x Headphone [AD198x Headphone] Subdevices: 1/1 Subdevice #0: subdevice #0 echo "auto" > /sys/class/sound/hwC1D0/modelname echo 1 > /sys/class/sound/hwC1D0/reconfig aplay -l card 1: Intel [HDA Intel], device 0: AD198x Analog [AD198x Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Intel [HDA Intel], device 1: AD198x Digital [AD198x Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 echo "6stack-dig-fp" > /sys/class/sound/hwC1D0/modelname echo 1 > /sys/class/sound/hwC1D0/reconfig aplay -l card 1: Intel [HDA Intel], device 0: AD198x Analog [AD198x Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Intel [HDA Intel], device 1: AD198x Digital [AD198x Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: Intel [HDA Intel], device 2: AD198x Headphone [AD198x Headphone] Subdevices: 1/1 Subdevice #0: subdevice #0 ALSA hda_hwdep.c:220: hda-codec: reconfiguring snd: bad kfree (called from f8be4636) Pid: 8079, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be807e>] snd_hda_ctls_clear+0x35/0x45 [snd_hda_codec] [<f8be8180>] snd_hda_codec_reset+0xf2/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8079, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be8089>] snd_hda_ctls_clear+0x40/0x45 [snd_hda_codec] [<f8be8180>] snd_hda_codec_reset+0xf2/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8079, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be81de>] snd_hda_codec_reset+0x150/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8079, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be81e9>] snd_hda_codec_reset+0x15b/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= ALSA hda_codec.c:3961: hda_codec: model 'auto' is selected ALSA hda_codec.c:4900: autoconfig: line_outs=4 (0x12/0x16/0x24/0x25/0x0) type:line ALSA hda_codec.c:4904: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) ALSA hda_codec.c:4908: hp_outs=1 (0x11/0x0/0x0/0x0/0x0) ALSA hda_codec.c:4909: mono: mono_out=0x0 ALSA hda_codec.c:4912: dig-out=0x1b/0x0 ALSA hda_codec.c:4913: inputs:<7>ALSA hda_codec.c:4917: Front Mic=0x14<7>ALSA hda_codec.c:4917: Rear Mic=0x17<7>ALSA hda_codec.c:4917: Line=0x15<7>ALSA hda_codec.c:4917: CD=0x18<7>ALSA hda_codec.c:4919: input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/input/input8 ALSA hda_codec.c:2370: Cannot find slave Mono Playback Volume, skipped ALSA hda_codec.c:2370: Cannot find slave Speaker Playback Volume, skipped ALSA hda_codec.c:2370: Cannot find slave Mono Playback Switch, skipped ALSA hda_codec.c:2370: Cannot find slave Speaker Playback Switch, skipped snd: bad kfree (called from f8be4636) Pid: 8079, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8b79d29>] ad198x_free_kctls+0x37/0x3c [snd_hda_codec_analog] [<f8b7ad5a>] ad198x_build_controls+0x190/0x217 [snd_hda_codec_analog] [<f8be7481>] snd_hda_codec_build_controls+0x31/0x3d [snd_hda_codec] [<f8bec704>] reconfig_store+0x83/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= ALSA hda_hwdep.c:220: hda-codec: reconfiguring snd: bad kfree (called from f8be4636) Pid: 8201, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be807e>] snd_hda_ctls_clear+0x35/0x45 [snd_hda_codec] [<f8be8180>] snd_hda_codec_reset+0xf2/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8201, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be8089>] snd_hda_ctls_clear+0x40/0x45 [snd_hda_codec] [<f8be8180>] snd_hda_codec_reset+0xf2/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8201, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be81de>] snd_hda_codec_reset+0x150/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= snd: bad kfree (called from f8be4636) Pid: 8201, comm: bash Not tainted 2.6.27.41-170.2.117.fc10.i686 #1 [<c06aa30b>] ? printk+0xf/0x14 [<f895523e>] snd_hidden_kfree+0x2a/0x70 [snd] [<f8be4636>] ? snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be4636>] snd_array_free+0xe/0x25 [snd_hda_codec] [<f8be81e9>] snd_hda_codec_reset+0x15b/0x250 [snd_hda_codec] [<f8959ab8>] ? __snd_printk+0x33/0x3c [snd] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<f8bec6bf>] reconfig_store+0x3e/0xab [snd_hda_codec] [<f8bec681>] ? reconfig_store+0x0/0xab [snd_hda_codec] [<c0594ee1>] dev_attr_store+0x1b/0x23 [<c04ce68a>] sysfs_write_file+0xb4/0xdf [<c04ce5d6>] ? sysfs_write_file+0x0/0xdf [<c04932ee>] vfs_write+0x84/0xdf [<c04933e2>] sys_write+0x3b/0x60 [<c0404c8a>] syscall_call+0x7/0xb ======================= ALSA hda_codec.c:3961: hda_codec: model '6stack-dig-fp' is selected input: HDA Digital PCBeep as /devices/pci0000:00/0000:00:1b.0/input/input9

2 5

[alsa-devel] QasMixer 0.14.0 released
by Sebastian H. 15 Sep '11

15 Sep '11

QasMixer version 0.14.0 is now available. QasMixer is an ALSA mixer with a customized Qt GUI. Changes: * Cairo painting replaced with native Qt painting * Reduced flicker on a mixer change Homepage with more information http://xwmw.org/qasmixer Project page http://sourceforge.net/projects/qasmixer/ Happy volume changing! -- Sebastian Holtermann

1 0

[alsa-devel] ASoC: uninitialized variable i used in wait_for_dc_servo
by Axel Lin 15 Sep '11

15 Sep '11

hi Mark, I guess we need to initialize i to timeout value. comments? diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index e5e4607..5aee9cb 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -713,6 +713,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask) snd_soc_write(codec, WM8996_DC_SERVO_2, mask); /* Use the interrupt if possible */ + i = timeout; do { if (i2c->irq) { timeout = wait_for_completion_timeout(&wm8996->dcs_done, @@ -722,7 +723,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, u16 mask) } else { msleep(1); - if (--i) { + if (--i == 0) { timeout = 0; break; }

2 2

[alsa-devel] [PATCH] sound: Fix race condition in the pcm_lib "wait for space loop
by Arjan van de Ven 15 Sep '11

15 Sep '11

From 2e37f0a4b2289962e1a45d8e02f8a7f7adad619f Mon Sep 17 00:00:00 2001 From: Arjan van de Ven <arjan(a)linux.intel.com> Date: Mon, 5 Sep 2011 09:40:18 -0700 Subject: [PATCH] sound: Fix race condition in the pcm_lib "wait for space" loop The wait_for_avail() function in pcm_lib.c has a race in it (observed in practice by an Intel validation group). The function is supposed to return once space in the buffer has become available, or if some timeout happens. The entity that creates space (irq handler of sound driver and some such) will do a wake up on a waitqueue that this function registers for. However there are two races in the existing code 1) If space became available between the caller noticing there was no space and this function actually sleeping, the wakeup is missed and the timeout condition will happen instead 2) If a wakeup happened but not sufficient space became available, the code will loop again and wait for more space. However, if the second wake comes in prior to hitting the schedule_timeout_interruptible(), it will be missed, and potentially you'll wait out until the timeout happens. The fix consists of using more careful setting of the current state (so that if a wakeup happens in the main loop window, the schedule_timeout() falls through) and by checking for available space prior to going into the schedule_timeout() loop, but after being on the waitqueue and having the state set to interruptible. Signed-off-by: Arjan van de Ven <arjan(a)linux.intel.com> CC: Jaroslav Kysela <perex(a)perex.cz> CC: Takashi Iwai <tiwai(a)suse.de> CC: alsa-devel(a)alsa-project.org CC: linux-kernel(a)vger.kernel.org --- sound/core/pcm_lib.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 86d0caf..8848080 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1761,6 +1761,10 @@ static int wait_for_avail(struct snd_pcm_substream *substream, snd_pcm_uframes_t avail = 0; long wait_time, tout; + init_waitqueue_entry(&wait, current); + add_wait_queue(&runtime->tsleep, &wait); + set_current_state(TASK_INTERRUPTIBLE); + if (runtime->no_period_wakeup) wait_time = MAX_SCHEDULE_TIMEOUT; else { @@ -1771,16 +1775,34 @@ static int wait_for_avail(struct snd_pcm_substream *substream, } wait_time = msecs_to_jiffies(wait_time * 1000); } - init_waitqueue_entry(&wait, current); - add_wait_queue(&runtime->tsleep, &wait); + + /* + * We need to check if space became available already (and thus the + * wakeup happened already) prior to going into the sleep loop to + * close the race of space already having become available. + * This check must happen after been added to the waitqueue and + * having current state be INTERRUPTIBLE. + */ + + if (is_playback) + avail = snd_pcm_playback_avail(runtime); + else + avail = snd_pcm_capture_avail(runtime); + if (avail >= runtime->twake) + goto _endloop; + + for (;;) { if (signal_pending(current)) { err = -ERESTARTSYS; break; } snd_pcm_stream_unlock_irq(substream); - tout = schedule_timeout_interruptible(wait_time); + + tout = schedule_timeout(wait_time); + snd_pcm_stream_lock_irq(substream); + set_current_state(TASK_INTERRUPTIBLE); switch (runtime->status->state) { case SNDRV_PCM_STATE_SUSPENDED: err = -ESTRPIPE; @@ -1814,6 +1836,7 @@ static int wait_for_avail(struct snd_pcm_substream *substream, break; } _endloop: + set_current_state(TASK_RUNNING); remove_wait_queue(&runtime->tsleep, &wait); *availp = avail; return err; -- 1.7.6 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org

3 4

[alsa-devel] [PATCH] ASoC: samsung: Fix checking return value of clk_get
by Axel Lin 15 Sep '11

15 Sep '11

clk_get() returns a pointer to the struct clk or an ERR_PTR(). Signed-off-by: Axel Lin <axel.lin(a)gmail.com> Cc: Christian Pellegrin <chripell(a)evolware.org> Cc: Ben Dooks <ben(a)simtec.co.uk> Cc: Sangbeom Kim <sbkim73(a)samsung.com> Cc: Jassi Brar <jassisinghbrar(a)gmail.com> --- sound/soc/samsung/s3c2412-i2s.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 2 +- sound/soc/samsung/s3c24xx_uda134x.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/s3c2412-i2s.c b/sound/soc/samsung/s3c2412-i2s.c index 841ab14..cecdbad 100644 --- a/sound/soc/samsung/s3c2412-i2s.c +++ b/sound/soc/samsung/s3c2412-i2s.c @@ -69,7 +69,7 @@ static int s3c2412_i2s_probe(struct snd_soc_dai *dai) s3c2412_i2s.dma_playback = &s3c2412_i2s_pcm_stereo_out; s3c2412_i2s.iis_cclk = clk_get(dai->dev, "i2sclk"); - if (s3c2412_i2s.iis_cclk == NULL) { + if (IS_ERR(s3c2412_i2s.iis_cclk)) { pr_err("failed to get i2sclk clock\n"); iounmap(s3c2412_i2s.regs); return -ENODEV; diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 63d8849..9f888bc 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -383,7 +383,7 @@ static int s3c24xx_i2s_probe(struct snd_soc_dai *dai) return -ENXIO; s3c24xx_i2s.iis_clk = clk_get(dai->dev, "iis"); - if (s3c24xx_i2s.iis_clk == NULL) { + if (IS_ERR(s3c24xx_i2s.iis_clk)) { pr_err("failed to get iis_clock\n"); iounmap(s3c24xx_i2s.regs); return -ENODEV; diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index dc9d551..4da57cd 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c @@ -66,13 +66,13 @@ static int s3c24xx_uda134x_startup(struct snd_pcm_substream *substream) pr_debug("%s %d\n", __func__, clk_users); if (clk_users == 0) { xtal = clk_get(&s3c24xx_uda134x_snd_device->dev, "xtal"); - if (!xtal) { + if (IS_ERR(xtal)) { printk(KERN_ERR "%s cannot get xtal\n", __func__); ret = -EBUSY; } else { pclk = clk_get(&s3c24xx_uda134x_snd_device->dev, "pclk"); - if (!pclk) { + if (IS_ERR(pclk)) { printk(KERN_ERR "%s cannot get pclk\n", __func__); clk_put(xtal); -- 1.7.4.1

4 4

[alsa-devel] OSS emulation and hardware configuration
by Mike Crowe 15 Sep '11

15 Sep '11

Hi folks, Apologies if this is obvious, but how does the OSS emulation layer set hardware parameters at the codec level? We are working in an embedded environment, and using a custom codec driver. When we access it via the ALSA API, it works fine. We have a bf5xx_wm8990_hw_params() function with configures the critical hardware parameters of the codec, and I have diagnostics code in the driver which does kernel prints when the driver changes key codec parameters (such as bit rate, timing, etc). When my OSS application opens it's device and changes the audio rate, I don't see that function getting called. In core/oss/pcm_oss.c, I see the snd_pcm_oss_set_rate() function getting called, but I don't understand how it changes parameters in the codec. My bf5xx_wm8990_hw_params() never gets called. Can somebody please point me in the right direction? I have two applications who need to access the audio driver, and at different bit rates. I have to makes sure they are getting set correctly. Mike

5 9

[alsa-devel] pthread or snd_async_add_pcm_handler
by Maarten de Boer 14 Sep '11

14 Sep '11

Hello, I am doing MMAP-based full duplex audio processing. I looked at the direct_loop code in the alsa-lib/test/pcm.c example. Now I want to run do the audio processing asynchronously. The async_direct_loop in the example does this, but I was wondering: is there any advantage to using snd_async_add_pcm_handler over using a simple pthread? Thanks, Maarten

2 1

[alsa-devel] [PATCH 0/4] Cleanups for snd-usb-audio
by Daniel Mack 14 Sep '11

14 Sep '11

Hi, I prepared a subset of my work on the generic USB audio driver that doesn't actually change any logic but just moves around major chunks of code. Can we get this merged as preparation for the more intrusive parts that follow? Thanks, Daniel Daniel Mack (4): USB: Add endpoint usage definitions to ch9.h ALSA: snd-usb: re-order the Makefile ALSA: snd-usb: re-order code ALSA: snd-usb: move code from urb.c to endpoint.c include/linux/usb/ch9.h | 17 +- sound/usb/Makefile | 12 +- sound/usb/card.c | 4 +- sound/usb/endpoint.c | 1185 +++++++++++++++++++++++++++++++++-------------- sound/usb/endpoint.h | 20 +- sound/usb/pcm.c | 2 +- sound/usb/quirks.c | 7 +- sound/usb/stream.c | 452 ++++++++++++++++++ sound/usb/stream.h | 12 + sound/usb/urb.c | 941 ------------------------------------- sound/usb/urb.h | 21 - 11 files changed, 1341 insertions(+), 1332 deletions(-) create mode 100644 sound/usb/stream.c create mode 100644 sound/usb/stream.h delete mode 100644 sound/usb/urb.c delete mode 100644 sound/usb/urb.h -- 1.7.5.4

4 13