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

[alsa-devel] [PATCH] ASoC: Convert wm8750 to a new-style i2c driver (testers wanted)
by Jean Delvare 26 Aug '08

26 Aug '08

Convert the wm8750 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Warning: this assumes that the spitz has its codec chip on I2C bus 0, which may or may not be the case. Someone with this machine please test and report. Note that you can safely ignore patch failures in i2c-id.h. include/linux/i2c-id.h | 1 sound/soc/codecs/wm8750.c | 108 ++++++++++++++++++++++----------------------- sound/soc/codecs/wm8750.h | 1 sound/soc/pxa/spitz.c | 1 4 files changed, 57 insertions(+), 54 deletions(-) --- linux-2.6.27-rc4.orig/include/linux/i2c-id.h 2008-08-26 16:40:44.000000000 +0200 +++ linux-2.6.27-rc4/include/linux/i2c-id.h 2008-08-26 16:41:12.000000000 +0200 @@ -65,7 +65,6 @@ #define I2C_DRIVERID_DS1672 81 /* Dallas/Maxim DS1672 RTC */ #define I2C_DRIVERID_TLV320AIC23B 87 /* TI TLV320AIC23B audio codec */ #define I2C_DRIVERID_WM8731 89 /* Wolfson WM8731 audio codec */ -#define I2C_DRIVERID_WM8750 90 /* Wolfson WM8750 audio codec */ #define I2C_DRIVERID_WM8753 91 /* Wolfson WM8753 audio codec */ #define I2C_DRIVERID_LM4857 92 /* LM4857 Audio Amplifier */ #define I2C_DRIVERID_VP27SMPX 93 /* Panasonic VP27s tuner internal MPX */ --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.c 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.c 2008-08-26 16:01:06.000000000 +0200 @@ -846,83 +846,87 @@ static struct snd_soc_device *wm8750_soc * low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8750_i2c_driver; -static struct i2c_client client_template; - -static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8750_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8750_socdev; - struct wm8750_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) - return -ENOMEM; - i2c_set_clientdata(i2c, codec); - codec->control_data = i2c; - - ret = i2c_attach_client(i2c); - if (ret < 0) { - pr_err("failed to attach codec at addr %x\n", addr); - goto err; - } ret = wm8750_init(socdev); - if (ret < 0) { + if (ret < 0) pr_err("failed to initialise WM8750\n"); - goto err; - } - return ret; -err: - kfree(i2c); return ret; } -static int wm8750_i2c_detach(struct i2c_client *client) +static int wm8750_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8750_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8750_codec_probe); -} +static const struct i2c_device_id wm8750_i2c_id[] = { + { "wm8750", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8750_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8750_i2c_driver = { .driver = { .name = "WM8750 I2C Codec", .owner = THIS_MODULE, }, - .id = I2C_DRIVERID_WM8750, - .attach_adapter = wm8750_i2c_attach, - .detach_client = wm8750_i2c_detach, - .command = NULL, + .probe = wm8750_i2c_probe, + .remove = wm8750_i2c_remove, + .id_table = wm8750_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8750", - .driver = &wm8750_i2c_driver, -}; +static int wm8750_add_i2c_device(struct platform_device *pdev, + const struct wm8750_setup_data *setup) +{ + struct snd_soc_device *socdev = platform_get_drvdata(pdev); + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8750_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8750", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + socdev->codec->control_data = client; + + return 0; + +err_driver: + i2c_del_driver(&wm8750_i2c_driver); + return -ENODEV; +} #endif static int wm8750_probe(struct platform_device *pdev) @@ -954,11 +958,8 @@ static int wm8750_probe(struct platform_ #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8750_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8750_add_i2c_device(pdev, setup); } #else /* Add other interfaces here */ @@ -1002,6 +1003,7 @@ static int wm8750_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8750_i2c_driver); #endif kfree(codec->private_data); --- linux-2.6.27-rc4.orig/sound/soc/codecs/wm8750.h 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/codecs/wm8750.h 2008-08-26 15:48:15.000000000 +0200 @@ -58,6 +58,7 @@ #define WM8750_SYSCLK 0 struct wm8750_setup_data { + int i2c_bus; unsigned short i2c_address; }; --- linux-2.6.27-rc4.orig/sound/soc/pxa/spitz.c 2008-08-26 15:39:54.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/pxa/spitz.c 2008-08-26 15:48:15.000000000 +0200 @@ -337,6 +337,7 @@ static struct snd_soc_machine snd_soc_ma /* spitz audio private data */ static struct wm8750_setup_data spitz_wm8750_setup = { + .i2c_bus = 0, .i2c_address = 0x1b, }; -- Jean Delvare

2 2

[alsa-devel] alsa regression: snd_bt87x mute (not mixer related)
by Jorge Peixoto de Morais Neto 26 Aug '08

26 Aug '08

Hi. Under kernel 2.6.23, I could get sound from the alsa device created by the module snd_bt87x. In kernel 2.6.24, there is no sound. And yes, I have checked in alsamixer that the device is not muted. Also, in kernel 2.6.23 the device would only appear if I modprobed the module with the option load_all=1. In kernel 2.6.24, the option load_all=1 is unnecessary for the device to appear. This is probably because I have in 2007 sent an email to this list (http://mailman.alsa-project.org/pipermail/alsa-devel/2007-August/002617.html) with information about my board, and it was responded by Takashi. I have tried the latest linux-2.6.27-rc4 hoping the problem could have been fixed. No improvement. Could you please look at this? It is an important regression. I have included extensive information about my system (under both linux-2.6.23, where my card works, and linux-2.6.27-rc4) in the tarball attached. If you need any other information please ask me. Regards, Jorge Peixoto de Morais Neto

1 0

[alsa-devel] ice1724 - TerraTec PHASE 22 no MIDI ports get created
by Vedran Miletić 26 Aug '08

26 Aug '08

Hi guys, There was "MIDI on ice1724" thread not-so-recently, and it had a patch attached. Changelog says that the patch was added to ALSA in 1.0.17. So I took out my dusty TerraTec PHASE 22 out of the closet (and removed the dust, of course :-) ), but I can't get MIDI to work there. Regardless of ALSA version (1.0.15 - 1.0.17, even 1.0.18rc1), I get no MIDI ports at all: vedran@kalopsia:~$ amidi -l Dir Device Name vedran@kalopsia:~$ Why don't MIDI ports get created? I tried looking at the source, but I couldn't figure out how this "creation of midi ports" happens (or doesn't happen, as in this case). -- Vedran Miletić

3 5

[alsa-devel] OSS emulatior can not create enough device files for me
by Taipei Techwell 26 Aug '08

26 Aug '08

Hi, I am working on an ALSA audio driver for my device which is very similar to BT878. It will have at least 8 audio devices in a single card. Now, the audio driver is working correctly. I can use aplay to play the audio file which is created by arecord. To identify audio devices, I am using hw:1 ~ hw:8 dvice description for my audio devices, because hw:0 is the sound card. In order to make the old application work, I know that ALSA emulates all my devices to have OSS nodes respectively. I guess that It should have /dev/dsp to /dev/dsp8, and /dev/dsp is for sound card, and /dev/dsp1 to /dev/dsp8 are for my audio devices. However, I can not find /dev/dsp8 in my system. I guess ALSA can only emulate 8 audio device totally. That the reason I can not see the 8th audio device. Am I right? How can I create the /dev/dsp8 manually? By the way, if someting is wrong above, please correct me. Thank you.

2 1

[alsa-devel] [PATCH] ASoC: WM8903 I2C cleanups
by Mark Brown 26 Aug '08

26 Aug '08

Fix a few issues identified by Jean Delvare: - Add missing newline to error display. - Return an error when we fail to locate the I2C adaptor. - Remove the static wm8903_i2c_device Jean suggested, it's redundant. Cc: Jean Delvare <khali(a)linux-fr.org> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8903.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 73dfd5b..a3f54ec 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -1706,8 +1706,6 @@ static struct i2c_driver wm8903_i2c_driver = { .id_table = wm8903_i2c_id, }; -static struct i2c_client *wm8903_i2c_device; - static int wm8903_probe(struct platform_device *pdev) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); @@ -1716,6 +1714,7 @@ static int wm8903_probe(struct platform_device *pdev) struct wm8903_priv *wm8903; struct i2c_board_info board_info; struct i2c_adapter *adapter; + struct i2c_client *i2c_client; int ret = 0; setup = socdev->codec_data; @@ -1746,7 +1745,7 @@ static int wm8903_probe(struct platform_device *pdev) codec->hw_write = (hw_write_t)i2c_master_send; ret = i2c_add_driver(&wm8903_i2c_driver); if (ret != 0) { - dev_err(&pdev->dev, "can't add i2c driver"); + dev_err(&pdev->dev, "can't add i2c driver\n"); goto err_priv; } else { memset(&board_info, 0, sizeof(board_info)); @@ -1757,12 +1756,13 @@ static int wm8903_probe(struct platform_device *pdev) if (!adapter) { dev_err(&pdev->dev, "Can't get I2C bus %d\n", setup->i2c_bus); + ret = -ENODEV; goto err_adapter; } - wm8903_i2c_device = i2c_new_device(adapter, &board_info); + i2c_client = i2c_new_device(adapter, &board_info); i2c_put_adapter(adapter); - if (wm8903_i2c_device == NULL) { + if (i2c_client == NULL) { dev_err(&pdev->dev, "I2C driver registration failed\n"); ret = -ENODEV; @@ -1792,7 +1792,7 @@ static int wm8903_remove(struct platform_device *pdev) snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); - i2c_unregister_device(wm8903_i2c_device); + i2c_unregister_device(socdev->codec->control_data); i2c_del_driver(&wm8903_i2c_driver); kfree(codec->private_data); kfree(codec); -- 1.5.6.5

3 2

[alsa-devel] [PATCH] ASoC: Add missing new-line at end of strings
by Jean Delvare 26 Aug '08

26 Aug '08

Two warning messages lack their trailing new-line, add it. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> --- sound/soc/at91/at91-ssc.c | 2 +- sound/soc/davinci/davinci-i2s.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- linux-2.6.27-rc4.orig/sound/soc/at91/at91-ssc.c 2008-08-13 09:51:02.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/at91/at91-ssc.c 2008-08-26 15:45:11.000000000 +0200 @@ -408,7 +408,7 @@ static int at91_ssc_hw_params(struct snd dma_params->pdc_xfer_size = 4; break; default: - printk(KERN_WARNING "at91-ssc: unsupported PCM format"); + printk(KERN_WARNING "at91-ssc: unsupported PCM format\n"); return -EINVAL; } --- linux-2.6.27-rc4.orig/sound/soc/davinci/davinci-i2s.c 2008-08-05 18:18:18.000000000 +0200 +++ linux-2.6.27-rc4/sound/soc/davinci/davinci-i2s.c 2008-08-26 15:45:04.000000000 +0200 @@ -256,7 +256,7 @@ static int davinci_i2s_hw_params(struct mcbsp_word_length = DAVINCI_MCBSP_WORD_32; break; default: - printk(KERN_WARNING "davinci-i2s: unsupported PCM format"); + printk(KERN_WARNING "davinci-i2s: unsupported PCM format\n"); return -EINVAL; } -- Jean Delvare

2 1

Re: [alsa-devel] [PATCH] ASoC: Add WM8903 CODEC driver
by Jean Delvare 26 Aug '08

26 Aug '08

Hi Mark, On Tue, 26 Aug 2008 13:05:27 +0100, Mark Brown wrote: > The WM8903 is a high performance ultra-low power stereo CODEC optimised > for portable audio applications. Features include: > > * 5mW power consumption for DAC to headphone playback > * Stereo DAC SNR 96dB typical, THD -86dB typical > * Stereo ADC SNR 93dB typical, THD -80dB typical > * Up to 3 single ended inputs per stereo channel > * Up to 2 pseudo differential inputs per stereo channel > * Up to 1 fully differential mic input per stereo channel > * Digital Dynamic Range Controller (compressor/limiter) > * Digital sidetone mixing > > Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> > --- > sound/soc/codecs/Kconfig | 4 + > sound/soc/codecs/Makefile | 2 + > sound/soc/codecs/wm8903.c | 1813 +++++++++++++++++++++++++++++++++++++++++++++ > sound/soc/codecs/wm8903.h | 1463 ++++++++++++++++++++++++++++++++++++ > 4 files changed, 3282 insertions(+), 0 deletions(-) > create mode 100644 sound/soc/codecs/wm8903.c > create mode 100644 sound/soc/codecs/wm8903.h Here are minor issues I spotted in the i2c part of your driver: > (...) > +static int wm8903_i2c_probe(struct i2c_client *i2c, > + const struct i2c_device_id *id) > +{ > + struct snd_soc_device *socdev = wm8903_socdev; > + struct snd_soc_codec *codec = socdev->codec; > + int ret; > + > + i2c_set_clientdata(i2c, codec); > + codec->control_data = i2c; > + > + ret = wm8903_init(socdev); > + if (ret < 0) > + dev_err(&i2c->dev, "Device initialisation failed\n"); > + > + return ret; > +} > + > +static int wm8903_i2c_remove(struct i2c_client *client) > +{ > + struct snd_soc_codec *codec = i2c_get_clientdata(client); > + kfree(codec->reg_cache); > + return 0; > +} > + > +/* i2c codec control layer */ > +static const struct i2c_device_id wm8903_i2c_id[] = { > + { "wm8903", 0 }, > + { } > +}; > +MODULE_DEVICE_TABLE(i2c, wm8903_i2c_id); > + > +static struct i2c_driver wm8903_i2c_driver = { > + .driver = { > + .name = "WM8903", > + .owner = THIS_MODULE, > + }, > + .probe = wm8903_i2c_probe, > + .remove = wm8903_i2c_remove, > + .id_table = wm8903_i2c_id, > +}; > + > +static struct i2c_client *wm8903_i2c_device; I know that I am the one who came up with this idea, but on second thought, wm8903_i2c_device will always be equal to wm8903_socdev->codec->control_data, so we can easily do without it. > + > +static int wm8903_probe(struct platform_device *pdev) > +{ > + struct snd_soc_device *socdev = platform_get_drvdata(pdev); > + struct wm8903_setup_data *setup; > + struct snd_soc_codec *codec; > + struct wm8903_priv *wm8903; > + struct i2c_board_info board_info; > + struct i2c_adapter *adapter; > + int ret = 0; > + > + setup = socdev->codec_data; > + > + if (!setup->i2c_address) { > + dev_err(&pdev->dev, "No codec address provided\n"); > + return -ENODEV; > + } > + > + codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); > + if (codec == NULL) > + return -ENOMEM; > + > + wm8903 = kzalloc(sizeof(struct wm8903_priv), GFP_KERNEL); > + if (wm8903 == NULL) { > + ret = -ENOMEM; > + goto err_codec; > + } > + > + codec->private_data = wm8903; > + socdev->codec = codec; > + mutex_init(&codec->mutex); > + INIT_LIST_HEAD(&codec->dapm_widgets); > + INIT_LIST_HEAD(&codec->dapm_paths); > + > + wm8903_socdev = socdev; > + > + codec->hw_write = (hw_write_t)i2c_master_send; > + ret = i2c_add_driver(&wm8903_i2c_driver); > + if (ret != 0) { > + dev_err(&pdev->dev, "can't add i2c driver"); Missing \n at end of string (looks like many other drivers have this problem - I found 11 other cases under sound/soc, I can send a patch fixing these if you want.) > + goto err_priv; > + } else { > + memset(&board_info, 0, sizeof(board_info)); > + strlcpy(board_info.type, "wm8903", I2C_NAME_SIZE); > + board_info.addr = setup->i2c_address; > + > + adapter = i2c_get_adapter(setup->i2c_bus); > + if (!adapter) { > + dev_err(&pdev->dev, "Can't get I2C bus %d\n", > + setup->i2c_bus); > + goto err_adapter; You are jumping to the error path but ret has value 0. This means that the function returns success when you really mean failure, and trouble is likely to arise after that. > + } > + > + wm8903_i2c_device = i2c_new_device(adapter, &board_info); > + i2c_put_adapter(adapter); > + if (wm8903_i2c_device == NULL) { > + dev_err(&pdev->dev, > + "I2C driver registration failed\n"); > + ret = -ENODEV; > + goto err_adapter; > + } > + } > + > + return ret; > + > +err_adapter: > + i2c_del_driver(&wm8903_i2c_driver); > +err_priv: > + kfree(codec->private_data); > +err_codec: > + kfree(codec); > + return ret; > +} -- Jean Delvare

3 3

[alsa-devel] [PATCH] ASoC: Fix error paths in N810 machine driver init and release clocks at exit
by Jarkko Nikula 26 Aug '08

26 Aug '08

Thanks to Felipe Balbi <felipe.balbi(a)nokia.com> by noticing that if clk_get to sys_clkout2_src fails, then n810_snd_device is never released. Add also sys_clkout2_src release into error path, error code return and release the clocks at exit. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)nokia.com> --- sound/soc/omap/n810.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 7694621..87d0ed0 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -329,12 +329,14 @@ static int __init n810_soc_init(void) sys_clkout2_src = clk_get(dev, "sys_clkout2_src"); if (IS_ERR(sys_clkout2_src)) { dev_err(dev, "Could not get sys_clkout2_src clock\n"); - return -ENODEV; + err = PTR_ERR(sys_clkout2_src); + goto err2; } sys_clkout2 = clk_get(dev, "sys_clkout2"); if (IS_ERR(sys_clkout2)) { dev_err(dev, "Could not get sys_clkout2\n"); - goto err1; + err = PTR_ERR(sys_clkout2); + goto err3; } /* * Configure 12 MHz output on SYS_CLKOUT2. Therefore we must use @@ -343,7 +345,8 @@ static int __init n810_soc_init(void) func96m_clk = clk_get(dev, "func_96m_ck"); if (IS_ERR(func96m_clk)) { dev_err(dev, "Could not get func 96M clock\n"); - goto err2; + err = PTR_ERR(func96m_clk); + goto err4; } clk_set_parent(sys_clkout2_src, func96m_clk); clk_set_rate(sys_clkout2, 12000000); @@ -356,20 +359,25 @@ static int __init n810_soc_init(void) gpio_direction_output(N810_SPEAKER_AMP_GPIO, 0); return 0; -err2: +err4: clk_put(sys_clkout2); +err3: + clk_put(sys_clkout2_src); +err2: platform_device_del(n810_snd_device); err1: platform_device_put(n810_snd_device); return err; - } static void __exit n810_soc_exit(void) { gpio_free(N810_SPEAKER_AMP_GPIO); gpio_free(N810_HEADSET_AMP_GPIO); + clk_put(sys_clkout2_src); + clk_put(sys_clkout2); + clk_put(func96m_clk); platform_device_unregister(n810_snd_device); } -- 1.5.6.3

3 2

[alsa-devel] [PATCH] ASoC: Fix double free and memory leak in many codec drivers
by Mark Brown 26 Aug '08

26 Aug '08

From: Jean Delvare <khali(a)linux-fr.org> Many SoC audio codec drivers have improper freeing of memory in error paths. * codec is allocated in the platform device probe function, but is not freed there in case of error. Instead it is freed in the i2c device probe function's error path. However the success or failure of both functions is not linked, so this could result in a double free (if the platform device is successfully probed, the i2c device probing fails and then the platform driver is unregistered.) * codec->private_data is allocated in many platform device probe functions but not freed in their error paths. This patch hopefully solves all these problems. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/ak4535.c | 11 +++++++---- sound/soc/codecs/tlv320aic3x.c | 11 +++++++---- sound/soc/codecs/uda1380.c | 9 +++++---- sound/soc/codecs/wm8510.c | 9 +++++---- sound/soc/codecs/wm8731.c | 11 +++++++---- sound/soc/codecs/wm8750.c | 10 ++++++---- sound/soc/codecs/wm8753.c | 11 +++++++---- sound/soc/codecs/wm8990.c | 11 +++++++---- 8 files changed, 51 insertions(+), 32 deletions(-) diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index b26003c..7da9f46 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -562,10 +562,9 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -583,7 +582,6 @@ static int ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -660,6 +658,11 @@ static int ak4535_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index b1dce5f..5f9abb1 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1199,10 +1199,9 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -1221,7 +1220,6 @@ static int aic3x_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -1302,6 +1300,11 @@ static int aic3x_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index a52d6d9..807318f 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c @@ -729,10 +729,9 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -750,7 +749,6 @@ static int uda1380_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -817,6 +815,9 @@ static int uda1380_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) + kfree(codec); return ret; } diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 67325fd..3d998e6 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -693,10 +693,9 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -714,7 +713,6 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -782,6 +780,9 @@ static int wm8510_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) + kfree(codec); return ret; } diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 369d39c..9402fca 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -596,10 +596,9 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -617,7 +616,6 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -693,6 +691,11 @@ static int wm8731_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index c6a8edf..dd1f554 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -869,10 +869,9 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -890,7 +889,6 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -966,6 +964,10 @@ static int wm8750_probe(struct platform_device *pdev) /* Add other interfaces here */ #endif + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index dc7b18f..5761164 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1660,10 +1660,9 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (!i2c) { - kfree(codec); + if (!i2c) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -1682,7 +1681,6 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -1759,6 +1757,11 @@ static int wm8753_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index e44153f..dd995ef 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -1500,10 +1500,9 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) client_template.addr = addr; i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); + if (i2c == NULL) return -ENOMEM; - } + i2c_set_clientdata(i2c, codec); codec->control_data = i2c; @@ -1521,7 +1520,6 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) return ret; err: - kfree(codec); kfree(i2c); return ret; } @@ -1595,6 +1593,11 @@ static int wm8990_probe(struct platform_device *pdev) #else /* Add other interfaces here */ #endif + + if (ret != 0) { + kfree(codec->private_data); + kfree(codec); + } return ret; } -- 1.5.6.3

4 4

Re: [alsa-devel] [Alsa-user] Sound card recording support @ 96kHz or above
by Vedran Miletić 26 Aug '08

26 Aug '08

Terrasoniq TS22 (newer revision of TerraTec PHASE 22) might do it for you. Almost anything Envy24-series based will offer what you want. Not sure how you would check that it actually works, though. 2008/8/26 Ben Gould <ben.gould(a)gmail.com>: > These cards don't seem to be in production any more. > > Any suggestions for more recent off-the-shelf hardware that will capture > a single stereo input at 96kHz (using ALSA)? > > -- ben > > Sergei Steshenko wrote: >> >> -----Original Message----- >> From: Ben Gould <ben.gould(a)gmail.com> >> To: alsa-user(a)lists.sourceforge.net >> Date: Thu, 21 Aug 2008 16:57:43 +0059 >> Subject: [Alsa-user] Sound card recording support @ 96kHz or above >> >>> Hi all, >>> >>> A project I'm working on using linux & alsa requires a higher than >>> normal sampling rate, not just up-sampling from 48kHz. >>> >>> I wonder whether anyone here can recommend a sound card that's capable >>> of recording a single stereo input at 96kHz sample rate (16 bits would >>> be sufficient). >>> >>> Obviously it needs to be properly supported by alsa... >>> >>> Thanks in advance >>> >>> -- ben >>> >> >> M-Audio Revolution 7.1, 5.1. >> >> Regards, >> Sergei. >> >> > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Alsa-user mailing list > Alsa-user(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/alsa-user > -- Vedran Miletić

2 1