diff options
| author | Dan Carpenter <error27@gmail.com> | 2009-04-06 03:50:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-06 10:53:37 +0100 |
| commit | 09318c47b6121c8d18cee50ca7e270a8b7dfd274 (patch) | |
| tree | c63f57d625b19c869765fa6ba949d6b3821dbc7b /sound/soc | |
| parent | 103f211d0be2bed75b5739de62a10415ef0bbc25 (diff) | |
| download | op-kernel-dev-09318c47b6121c8d18cee50ca7e270a8b7dfd274.zip op-kernel-dev-09318c47b6121c8d18cee50ca7e270a8b7dfd274.tar.gz | |
ASoC: Fix null dereference in ak4535_remove()
ak4535_remove() from sound/soc/codecs/ak4535.c calls
i2c_unregister_device() with a possibly null pointer.
This bug was found by smatch (http://repo.or.cz/w/smatch.git/).
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/ak4535.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index 1f63d38..dd33802 100644 --- 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) - 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); |
