diff options
| author | merge <null@invalid> | 2009-02-17 01:10:32 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-02-17 01:10:32 +0000 |
| commit | 53967cb8ccaa5c0230f62f4fcf96f950c921992a (patch) | |
| tree | 954eaf98b06d106666d929f60ac43bd43af5de8d /sound | |
| parent | 0d8d2fe29182f0eaed6abbd7533d6667a5d0f42d (diff) | |
MERGE-via-pending-tracking-hist-wm8753-unregister-i2c-device-b
pending-tracking-hist top was wm8753-unregister-i2c-device-b / 31c3d7550beb6e4b6bcc8da63b81211e00e9f676 ... parent commitmessage:
From: Paul Fertser <fercerpav@gmail.com>
wm8753: unregister I2C device (backport from upstream)
This is the last change necessary to be able to load/unload all sound
modules on Neo FreeRunner.
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 1 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 650a450b7c0..8dbf6083b87 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1887,6 +1887,7 @@ static int wm8753_remove(struct platform_device *pdev) snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8753_i2c_driver); } #endif diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 24b1a8180ee..4aa4e858ca0 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -673,6 +673,7 @@ static int __init neo1973_gta02_init(void) static void __exit neo1973_gta02_exit(void) { + snd_soc_unregister_dai(&bt_dai); platform_device_unregister(neo1973_gta02_snd_device); } |