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

Re: [alsa-devel] [PATCH RESEND] sound: make OSS sound core optional
by Takashi Iwai 27 Aug '08

27 Aug '08

At Wed, 27 Aug 2008 11:37:44 +0200, Tejun Heo wrote: > > Hello, > > Takashi Iwai wrote: > >> +config SOUND_OSS_CORE > >> + bool > >> + default n > >> + > >> source "sound/oss/dmasound/Kconfig" > > > > This seems missing from the scope. > > But, I think this should be rather in the block "if SOUND_PRIME" below. > > SOUND_OSS_CORE should be turned on if ALSA OSS emul is turned on or > arch-um hostsound is turned on, both of which can be enabled regardless > of SOUND_PRIME, no? Yes, sorry, I didn't cite clearly. I meant only the last line. sound/oss/dmasound/Kconfig is included and evaluated outside the block "if SOUND_PRIME". Thus, CONFIG_SOUND_OSS_CORE won't be enabled for drivers in sound/oss/dmasound. My suggestion is to move that line source sound/oss/dmasound/Kconfig into the "if SOUND_PRIME" block first, then apply your patch. Anyway, there are some other minor issues in sound/Kconfig, for example, why "if !M68K" is there. We can clean up a bit more. thanks, Takashi

1 0

Re: [alsa-devel] [PATCH RESEND] sound: make OSS sound core optional
by Takashi Iwai 27 Aug '08

27 Aug '08

At Wed, 27 Aug 2008 10:19:35 +0200, Tejun Heo wrote: > > sound/sound_core.c implements soundcore.ko contains two parts - > sound_class which is shared by both ALSA and OSS and device > redirection support for OSS. It's always compiled when any sound > support is enabled although it's necessary only when OSS (the actual > one or emulation) is enabled. This is slightly wasteful and as device > redirection always registers character device region for major 14, it > prevents alternative implementation. > > This patch introduces a new config SOUND_OSS_CORE which is selected > iff OSS support is actually necessary and build the OSS core part > conditionally. > > If OSS is disabled, soundcore merely contains sound_class but leaving > it that way seems to be the simplest approach as otherwise sound_class > should be in ALSA core file if OSS is disabled but should be in > soundcore if OSS is enabled and there's also the user confusion > factor. > > Signed-off-by: Tejun Heo <tj(a)kernel.org> Thanks for the patch. I like the idea. > +config SOUND_OSS_CORE > + bool > + default n > + > source "sound/oss/dmasound/Kconfig" This seems missing from the scope. But, I think this should be rather in the block "if SOUND_PRIME" below. > --- work.orig/sound/sound_core.c > +++ work/sound/sound_core.c (snip) > +MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR); This alias should be in #ifdef CONFIG_SOUND_OSS_CORE. The module doesn't provide that major without CONFIG_SOUND_OSS_CORE. Takashi

1 0

Re: [alsa-devel] [ALSA PATCH] alsa-git merge request
by Takashi Iwai 27 Aug '08

27 Aug '08

At Tue, 26 Aug 2008 23:10:55 +0200, Guillaume Chazarain wrote: > > On Tue, Aug 26, 2008 at 7:59 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > > Are you sure both are the same kernel but just one commit reverted? > > I retested, yes. Thanks for confirmation! > With or without the revert, model=auto disables sound completely, and > I get this in dmesg: > > HDA Intel 0000:00:1b.0: PCI INT A disabled > HDA Intel 0000:00:1b.0: PCI INT A -> GSI 20 (level, low) -> IRQ 20 > HDA Intel 0000:00:1b.0: setting latency timer to 64 > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:2325: hda_codec: > model 'auto' is selected > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3021: autoconfig: > line_outs=1 (0x14/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3025: > speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3029: hp_outs=1 > (0x15/0x0/0x0/0x0/0x0) > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3030: mono: mono_out=0x0 > ALSA /home/g/linux-2.6/sound/pci/hda/hda_codec.c:3038: inputs: > mic=0x18, fmic=0x0, line=0x1a, fline=0x0, cd=0x0, aux=0x0 > > I played with model=intel-mac-auto and model=intel-mac-v3 but it had > no effect, i.e. same as without the model= parameter. > > So, without model=auto the problem is that I get the output on both > the internal speakers and the headphones, and this is fixed by > reverting the commit. Then this is really a PCI SSID conflict, and reverting the patch is the right fix (and possibly addition of check of codec SID). I fixed it now on my tree, and will include it in the next pull request. thanks, Takashi

1 0

[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