Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: Only unregister drivers we registered for WM8753

Browse source 
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2009-02-22 14:24:00 +00:00
parent eeb1080b29
commit 93e051d277
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sound/soc/codecs/wm8753.c
View file

@ -1845,6 +1845,7 @@ static int wm8753_remove(struct platform_device *pdev)
{ {
struct snd_soc_device *socdev = platform_get_drvdata(pdev); struct snd_soc_device *socdev = platform_get_drvdata(pdev);
struct snd_soc_codec *codec = socdev->card->codec; struct snd_soc_codec *codec = socdev->card->codec;
struct wm8753_setup_data *setup = socdev->codec_data;
if (codec->control_data) if (codec->control_data)
wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF); wm8753_set_bias_level(codec, SND_SOC_BIAS_OFF);
@ -1852,11 +1853,14 @@ static int wm8753_remove(struct platform_device *pdev)
snd_soc_free_pcms(socdev); snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev); snd_soc_dapm_free(socdev);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
i2c_unregister_device(codec->control_data); if (setup->i2c_address) {
i2c_del_driver(&wm8753_i2c_driver); i2c_unregister_device(codec->control_data);
i2c_del_driver(&wm8753_i2c_driver);
}
#endif #endif
#if defined(CONFIG_SPI_MASTER) #if defined(CONFIG_SPI_MASTER)
spi_unregister_driver(&wm8753_spi_driver); if (setup->spi)
spi_unregister_driver(&wm8753_spi_driver);
#endif #endif
kfree(codec->private_data); kfree(codec->private_data);
kfree(codec); kfree(codec);