diff options
| author |   Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-03-16 23:26:20 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-17 13:59:47 +0000 |
| commit | d2314e0e27566f8830ebed3587cc049e07e6a4ee (patch) | |
| tree | 14f27f22f0725f123c8882fe463db414cb3e5fda /sound/soc/soc-core.c | |
| parent | ASoC: Each PXA AC97 DAI needs a separate ops (diff) | |
| download | linux-dev-d2314e0e27566f8830ebed3587cc049e07e6a4ee.tar.xz linux-dev-d2314e0e27566f8830ebed3587cc049e07e6a4ee.zip | |
ASoC: Only deregister AC97 dev if it's name was not "AC97"
The commit 14fa43f53ff3a9c3d8b9662574b7369812a31a97 ("ASoC: Only
register AC97 bus if it's not done already") added a condition for
calling of soc_ac97_dev_register() but not added for calling of
soc_ac97_dev_unregister(). This patch adds same condition for
soc_ac97_dev_unregister(). Without this fix, kernel crashes when
unloading an asoc driver.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 16518329f6b2..6e710f705a74 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1432,7 +1432,8 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev) #ifdef CONFIG_SND_SOC_AC97_BUS for (i = 0; i < codec->num_dai; i++) { codec_dai = &codec->dai[i]; - if (codec_dai->ac97_control && codec->ac97) { + if (codec_dai->ac97_control && codec->ac97 && + strcmp(codec->name, "AC97") != 0) { soc_ac97_dev_unregister(codec); goto free_card; } |