[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20090316.232620.95066093.anemo@mba.ocn.ne.jp>
Date: Mon, 16 Mar 2009 23:26:20 +0900 (JST)
From: Atsushi Nemoto <anemo@....ocn.ne.jp>
To: Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc: Manuel Lauss <mano@...rinelk.homelinux.net>,
Takashi Iwai <tiwai@...e.de>, linux-kernel@...r.kernel.org
Subject: [PATCH] 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@....ocn.ne.jp>
---
I found this problem when I start debugging a new asoc driver. While
the driver is in very early stage, it should lack many things and have
many bugs. So I'm not sure this is asoc's bug or my driver's bug.
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 ec3f8bb..fec57a3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1435,7 +1435,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;
}
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists