diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-24 12:11:18 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-24 12:11:23 +0400 |
| commit | 416dfdcdb894432547ead4fcb9fa6a36b396059e (patch) | |
| tree | 8033fdda07397a59c5fa98c88927040906ce6c1a /sound/soc/codecs/ak4535.c | |
| parent | 56449f437add737a1e5e1cb7e00f63ac8ead1938 (diff) | |
| parent | 091069740304c979f957ceacec39c461d0192158 (diff) | |
| download | linux-416dfdcdb894432547ead4fcb9fa6a36b396059e.tar.xz | |
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Conflicts:
arch/x86/kernel/ptrace.c
Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
dependency change from upstream so that we can remove it
here.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/codecs/ak4535.c')
| -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 1f63d387a2f4..dd3380202766 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); |