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

[alsa-devel] [PATCH 2/3] asoc tlv320aic3x: add GPIO support
by Daniel Mack 25 Apr '08

25 Apr '08

This patch adds support for AIC3x GPIO lines. They can be configured for many possible functions as well as be driven manually. I also introduced i2c read functionality since the GPIO state register has to be read from hardware every time and can not be served from cache. Signed-off-by: Daniel Mack <daniel(a)caiaq.de>

2 3

[alsa-devel] asoc tsc210x
by ext-jukka.hynninen＠vaisala.com 25 Apr '08

25 Apr '08

Hello all, I'm assessing TSC2100 codec on an embdedded system. Any intentions on implementing an ASoC codec driver for TSC210x family? Could the multi-function nature of the chip raise some issues with ASoC framework? -Jukka

3 2

[alsa-devel] intel8x0 - copy function
by Harsha priya gupta 25 Apr '08

25 Apr '08

Hi, I am using Intel8x0 driver for my sound card. During data transfer from user to driver, I am trying to collect the buffer. I have implemented .copy function and also disabled the mmap. If I disable the mmap in .info structure, i get an error that the device is in use. If i try getting the debug messages; It fails in snd_pcm_common_ioctl1 for SNDRV_PCM_IOCTL_HW_REFINE. Can anyone please guide me on to the right path of implementing what I want to do. -- -Harsha

2 3

[alsa-devel] [RFC] [PATCH] asoc tlv320aic3x: revisit clocking setup
by Daniel Mack 25 Apr '08

25 Apr '08

Hi, attached is a patch that reworks the clocking setup for the aic3x codec. It drops the dividers table and calculates the values instead. When simulated, this code does the right thing for all the examples described in the datasheet. Please review and let me know about any concerns. BTW - I can't get in touch with the original author of this driver as his mail address doesn't work: <vbarinov(a)ru.mvista.com>: host mx2.mvista.com[206.112.117.9] said: 451 qq internal bug (#4.3.0) (in reply to end of DATA command) Does anyone have another contact? Best regards, Daniel

2 3

[alsa-devel] [RFC / PATCH] [SOUND] add a private field for ac97-device drivers and let ucb1400 be its first user
by Sebastian Siewior 25 Apr '08

25 Apr '08

From: Sebastian Siewior <bigeasy(a)linutronix.de> Currently the UCB1400 driver discovers the interrupt via probing. This works probably only on x86. This patch adds a private field to the ac97 struct where the ac97 driver can deposit informations for the device driver that serves a device which is attached to the ac97 bus. This patch also converts the UCB1400 driver to use this information if available. Signed-off-by: Sebastian Siewior <bigeasy(a)linutronix.de> --- drivers/input/touchscreen/ucb1400_ts.c | 12 ++++++++---- include/sound/ac97_codec.h | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 5ee175e..531fb4b 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c @@ -494,10 +494,14 @@ static int ucb1400_ts_probe(struct device *dev) goto err_free_devs; } - error = ucb1400_detect_irq(ucb); - if (error) { - printk(KERN_ERR "UCB1400: IRQ probe failed\n"); - goto err_free_devs; + if (!ucb->ac97->device_private_data) { + error = ucb1400_detect_irq(ucb); + if (error) { + printk(KERN_ERR "UCB1400: IRQ probe failed\n"); + goto err_free_devs; + } + } else { + ucb->irq = (int) ucb->ac97->device_private_data; } error = request_irq(ucb->irq, ucb1400_hard_irq, IRQF_TRIGGER_RISING, diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 0148058..b1af896 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -474,6 +474,10 @@ struct snd_ac97 { struct snd_ac97_build_ops * build_ops; void *private_data; void (*private_free) (struct snd_ac97 *ac97); + /* This field is used by device drivers which serve devices which are + * attached to the AC97 bus. + */ + void *device_private_data; /* --- */ struct snd_ac97_bus *bus; struct pci_dev *pci; /* assigned PCI device - used for quirks */ -- 1.5.4.3

2 2

[alsa-devel] Lenovo 3000 N100 ALC861-VD quirk
by Chris Pemberton 25 Apr '08

25 Apr '08

Hello, I'm revisiting an unresolved bug report I opened several months ago: bug # 0003468 The bug still exists as of ALSA v1.0.15 (Ubuntu 8.04). A quick recap: The following line in patch_realtek.c is my machine: SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo", ALC861VD_LENOVO), If I edit this line as follows, I get sound: SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo" ALC861VD_3ST), (or I can just pass model=3stack to get sound). Inserting headphones doesn't mute the speakers or power the headphones. But I can manually unmute the headphones via alsamixer (but speakers are still not muted). I do see that the special keyboard keys for speaker mute, volume up and volume down are working correctly; but I don't know if this is something ALSA is responsible for, or X, or Ubuntu. So if this is ALSA, thanks! Anything more I can do to help resolve this? Thanks, Chris

2 4

[alsa-devel] 2.6.25-rc8: why #define SND_HDA_NEEDS_RESUME is not set ?
by warped 25 Apr '08

25 Apr '08

Hi all, I have issue with 2.6.24/25 kernels and analog outs after s3 resume. Simply: after s3 resume analog outs are dead (no sound). SPDIF works OK. With 2.6.23.xx all was OK I browse ALSA code in 2.6.25-rc8 and see that in hda_codec.h define SND_HDA_NEEDS_RESUME is commented. Q is: -might uncommenting this line help me with my issue ? -why it is commented ? My hw is Abit AN-M2HD with ALC889. During boot Kernel reports: user.info kernel: hda_codec: Unknown model for ALC883, trying auto-probe from BIOS...

3 4

Re: [alsa-devel] [alsa-cvslog] alsa-kernel: add a private field for ac97-device drivers and let ucb1400 be its first user
by Takashi Iwai 25 Apr '08

25 Apr '08

At Fri, 25 Apr 2008 08:29:08 +0200 (CEST), Jaroslav Kysela wrote: > > changeset: 6120:e2ff47e8771b > tag: tip > user: perex > date: Fri Apr 25 08:29:05 2008 +0200 > files: include/ac97_codec.h kernel/drivers/input/touchscreen/ucb1400_ts.c > description: > add a private field for ac97-device drivers and let ucb1400 be its first user > From: Sebastian Siewior <bigeasy(a)linutronix.de> > > Currently the UCB1400 driver discovers the interrupt via probing. This works > probably only on x86. This patch adds a private field to the ac97 struct > where the ac97 driver can deposit informations for the device driver that > serves a device which is attached to the ac97 bus. > This patch also converts the UCB1400 driver to use this information if > available. > > Signed-off-by: Sebastian Siewior <bigeasy(a)linutronix.de> Jaroslav, as I posted yesterday, I don't think it's good to use a void pointer blindly there. In this case, it's different from a normal private_data, which is asigned and used by the same driver. This is a data passed by ac97 controller driver to another device driver. Thus, it should be a strong type. Also, a cast from a pointer to an int causes a compile warning. So, could you revert it until all issues are solved? thanks, Takashi > > diff -r 9c74d781f388 -r e2ff47e8771b include/ac97_codec.h > --- a/include/ac97_codec.h Fri Apr 25 08:15:12 2008 +0200 > +++ b/include/ac97_codec.h Fri Apr 25 08:29:05 2008 +0200 > @@ -475,6 +475,10 @@ struct snd_ac97 { > struct snd_ac97_build_ops * build_ops; > void *private_data; > void (*private_free) (struct snd_ac97 *ac97); > + /* This field is used by device drivers which serve devices which are > + * attached to the AC97 bus. > + */ > + void *device_private_data; > /* --- */ > struct snd_ac97_bus *bus; > struct pci_dev *pci; /* assigned PCI device - used for quirks */ > diff -r 9c74d781f388 -r e2ff47e8771b kernel/drivers/input/touchscreen/ucb1400_ts.c > --- a/kernel/drivers/input/touchscreen/ucb1400_ts.c Fri Apr 25 08:15:12 2008 +0200 > +++ b/kernel/drivers/input/touchscreen/ucb1400_ts.c Fri Apr 25 08:29:05 2008 +0200 > @@ -492,10 +492,14 @@ static int ucb1400_ts_probe(struct devic > goto err_free_devs; > } > > - error = ucb1400_detect_irq(ucb); > - if (error) { > - printk(KERN_ERR "UCB1400: IRQ probe failed\n"); > - goto err_free_devs; > + if (!ucb->ac97->device_private_data) { > + error = ucb1400_detect_irq(ucb); > + if (error) { > + printk(KERN_ERR "UCB1400: IRQ probe failed\n"); > + goto err_free_devs; > + } > + } else { > + ucb->irq = (int) ucb->ac97->device_private_data; > } > > error = request_irq(ucb->irq, ucb1400_hard_irq, IRQF_TRIGGER_RISING, > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by the 2008 JavaOne(SM) Conference > Don't miss this year's exciting event. There's still time to save $100. > Use priority code J8TL2D2. > http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/java… > _______________________________________________ > Alsa-cvslog mailing list > Alsa-cvslog(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/alsa-cvslog >

1 0

[alsa-devel] [PATCH v2][ASoC v2] Replace snd_soc_free_codec with snd_soc_unregister_codec
by Timur Tabi 24 Apr '08

24 Apr '08

The functions snd_soc_register_codec() and snd_soc_free_codec() are companion functions, but snd_soc_free_codec() releases resources (via kfree) that were not allocated by snd_soc_register_codec(). This means that the caller of snd_soc_register_codec() has to use a specific method to allocate these resources. So we replace snd_soc_free_codec() with snd_soc_unregister_codec(). This new function only unregisters the codec but does not free the memory resources. The caller can now allocate and free the memory resources as it sees fit. Also updated all callers of snd_soc_free_codec() to call snd_soc_unregister_codec() instead and free the resources themselves. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- I cannot get ASoC V2 to compile on my machine, so this code is untested. include/sound/soc-codec.h | 2 +- sound/soc/codecs/wm8350.c | 8 ++++++-- sound/soc/codecs/wm8731.c | 8 ++++++-- sound/soc/codecs/wm8750.c | 8 ++++++-- sound/soc/codecs/wm8753.c | 8 ++++++-- sound/soc/codecs/wm9712.c | 8 ++++++-- sound/soc/codecs/wm9713.c | 8 ++++++-- sound/soc/soc-core.c | 11 ++++------- 8 files changed, 41 insertions(+), 20 deletions(-) diff --git a/include/sound/soc-codec.h b/include/sound/soc-codec.h index 3cf4819..a809160 100644 --- a/include/sound/soc-codec.h +++ b/include/sound/soc-codec.h @@ -160,7 +160,7 @@ struct snd_soc_codec *snd_soc_new_codec( int snd_soc_register_codec(struct snd_soc_codec *codec, struct device *dev); -void snd_soc_free_codec(struct snd_soc_codec *codec); +void snd_soc_unregister_codec(struct snd_soc_codec *codec); int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, struct snd_ac97_bus_ops *ops, struct snd_card *card, diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3195d13..4ea8ced 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1436,7 +1436,9 @@ static int wm8350_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8350); prv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1446,7 +1448,9 @@ static int wm8350_codec_remove(struct platform_device *pdev) struct wm8350_data *wm8350 = codec->private_data; snd_soc_unregister_codec_dai(wm8350->dai); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); kfree(wm8350); return 0; } diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 0fe8766..2195c77 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -595,7 +595,9 @@ static int wm8731_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8731); wm8731_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -606,7 +608,9 @@ static int wm8731_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm8731->dai); kfree(wm8731); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 1b0296f..23e9126 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -898,7 +898,9 @@ static int wm8750_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8750); wm8750_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -909,7 +911,9 @@ static int wm8750_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm8750->dai); kfree(wm8750); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } static struct platform_driver wm8750_codec_driver = { diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 0d795f4..1cb2d64 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1584,7 +1584,9 @@ voice_err: codec_err: kfree(codec->private_data); err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1603,7 +1605,9 @@ static int wm8753_codec_remove(struct platform_device *pdev) /* free codec */ kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 16b6a18..7014190 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -715,7 +715,9 @@ aux_dai_err: codec_err: kfree(wm9712); priv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -728,7 +730,9 @@ static int wm9712_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm9712->aux_dai); kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 5e99bbe..d9ded51 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1154,7 +1154,9 @@ aux_dai_err: codec_err: kfree(wm9713); priv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1168,7 +1170,9 @@ static int wm9713_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm9713->voice_dai); kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 939b543..7dc6d68 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1856,21 +1856,18 @@ int snd_soc_register_codec(struct snd_soc_codec *codec, struct device *dev) EXPORT_SYMBOL_GPL(snd_soc_register_codec); /** - * snd_soc_free_codec - unregister and free codec. + * snd_soc_unregister_codec - unregister a codec. * @codec: codec driver * - * Unregisters a codec driver with the core and frees all its resources. + * Unregisters a codec driver with the core. */ -void snd_soc_free_codec(struct snd_soc_codec *codec) +void snd_soc_unregister_codec(struct snd_soc_codec *codec) { mutex_lock(&client_mutex); list_del(&codec->list); mutex_unlock(&client_mutex); - if (codec->reg_cache) - kfree(codec->reg_cache); - kfree(codec); } -EXPORT_SYMBOL_GPL(snd_soc_free_codec); +EXPORT_SYMBOL_GPL(snd_soc_unregister_codec); /** * snd_soc_register_platform_dai - registers a platform DAI. -- 1.5.5.1

2 1

[alsa-devel] [PATCH][ASoC v2] Replace snd_soc_free_codec with snd_soc_unregister_codec
by Timur Tabi 24 Apr '08

24 Apr '08

The functions snd_soc_register_codec() and snd_soc_free_codec() are companion functions, but snd_soc_free_codec() releases resources (via kfree) that were not allocated by snd_soc_register_codec(). This means that the caller of snd_soc_register_codec() has to use a specific method to allocate these resources. So we replace snd_soc_free_codec() with snd_soc_unregister_codec(). This new function only unregisters the codec but does not free the memory resources. The caller can now allocate and free the memory resources as it sees fit. Also updated all callers of snd_soc_free_codec() to call snd_soc_unregister_codec() instead and free the resources themselves. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- include/sound/soc-codec.h | 2 +- sound/soc/codecs/wm8350.c | 8 ++++++-- sound/soc/codecs/wm8731.c | 8 ++++++-- sound/soc/codecs/wm8750.c | 8 ++++++-- sound/soc/codecs/wm8753.c | 8 ++++++-- sound/soc/codecs/wm9712.c | 8 ++++++-- sound/soc/codecs/wm9713.c | 8 ++++++-- sound/soc/soc-core.c | 11 ++++------- 8 files changed, 41 insertions(+), 20 deletions(-) diff --git a/include/sound/soc-codec.h b/include/sound/soc-codec.h index 3cf4819..6f132ba 100644 --- a/include/sound/soc-codec.h +++ b/include/sound/soc-codec.h @@ -160,7 +160,7 @@ struct snd_soc_codec *snd_soc_new_codec( int snd_soc_register_codec(struct snd_soc_codec *codec, struct device *dev); -void snd_soc_free_codec(struct snd_soc_codec *codec); +void snd_soc_deregister_codec(struct snd_soc_codec *codec); int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, struct snd_ac97_bus_ops *ops, struct snd_card *card, diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 3195d13..4ea8ced 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1436,7 +1436,9 @@ static int wm8350_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8350); prv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1446,7 +1448,9 @@ static int wm8350_codec_remove(struct platform_device *pdev) struct wm8350_data *wm8350 = codec->private_data; snd_soc_unregister_codec_dai(wm8350->dai); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); kfree(wm8350); return 0; } diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 0fe8766..2195c77 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -595,7 +595,9 @@ static int wm8731_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8731); wm8731_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -606,7 +608,9 @@ static int wm8731_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm8731->dai); kfree(wm8731); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 1b0296f..23e9126 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -898,7 +898,9 @@ static int wm8750_codec_probe(struct platform_device *pdev) codec_err: kfree(wm8750); wm8750_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -909,7 +911,9 @@ static int wm8750_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm8750->dai); kfree(wm8750); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } static struct platform_driver wm8750_codec_driver = { diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 0d795f4..1cb2d64 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1584,7 +1584,9 @@ voice_err: codec_err: kfree(codec->private_data); err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1603,7 +1605,9 @@ static int wm8753_codec_remove(struct platform_device *pdev) /* free codec */ kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 16b6a18..7014190 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -715,7 +715,9 @@ aux_dai_err: codec_err: kfree(wm9712); priv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -728,7 +730,9 @@ static int wm9712_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm9712->aux_dai); kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 5e99bbe..d9ded51 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1154,7 +1154,9 @@ aux_dai_err: codec_err: kfree(wm9713); priv_err: - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return ret; } @@ -1168,7 +1170,9 @@ static int wm9713_codec_remove(struct platform_device *pdev) snd_soc_unregister_codec_dai(wm9713->voice_dai); kfree(codec->private_data); - snd_soc_free_codec(codec); + snd_soc_unregister_codec(codec); + kfree(codec->reg_cache); + kfree(codec); return 0; } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 939b543..7dc6d68 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1856,21 +1856,18 @@ int snd_soc_register_codec(struct snd_soc_codec *codec, struct device *dev) EXPORT_SYMBOL_GPL(snd_soc_register_codec); /** - * snd_soc_free_codec - unregister and free codec. + * snd_soc_unregister_codec - unregister a codec. * @codec: codec driver * - * Unregisters a codec driver with the core and frees all its resources. + * Unregisters a codec driver with the core. */ -void snd_soc_free_codec(struct snd_soc_codec *codec) +void snd_soc_unregister_codec(struct snd_soc_codec *codec) { mutex_lock(&client_mutex); list_del(&codec->list); mutex_unlock(&client_mutex); - if (codec->reg_cache) - kfree(codec->reg_cache); - kfree(codec); } -EXPORT_SYMBOL_GPL(snd_soc_free_codec); +EXPORT_SYMBOL_GPL(snd_soc_unregister_codec); /** * snd_soc_register_platform_dai - registers a platform DAI. -- 1.5.5.1

2 4