git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
ak4535.c
diff --git
a/sound/soc/codecs/ak4535.c
b/sound/soc/codecs/ak4535.c
index
1f63d38
..
dd33802
100644
(file)
--- a/
sound/soc/codecs/ak4535.c
+++ b/
sound/soc/codecs/ak4535.c
@@
-659,7
+659,8
@@
static int ak4535_remove(struct platform_device *pdev)
snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
snd_soc_free_pcms(socdev);
snd_soc_dapm_free(socdev);
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- i2c_unregister_device(codec->control_data);
+ if (codec->control_data)
+ i2c_unregister_device(codec->control_data);
i2c_del_driver(&ak4535_i2c_driver);
#endif
kfree(codec->private_data);
i2c_del_driver(&ak4535_i2c_driver);
#endif
kfree(codec->private_data);