aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 16:00:01 +0100
committerJaroslav Kysela <perex@suse.cz>2006-01-03 12:20:28 +0100
commite26e7545e9542425f140cb4c605a7ab5a3b13e00 (patch)
treeadbbb875ffba2bf48f18aa962cb0d260314744a5
parent[ALSA] pcm - NULL check in snd_pcm_suspend*() (diff)
downloadlinux-dev-e26e7545e9542425f140cb4c605a7ab5a3b13e00.tar.xz
linux-dev-e26e7545e9542425f140cb4c605a7ab5a3b13e00.zip
[ALSA] ac97 - NULL check in snd_ac97_suspend/resume
Modules: AC97 Codec Add NULL check in snd_ac97_suspend() and snd_ac97_resume() so that the caller doesn't have to do it by itself. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/ac97/ac97_codec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 9faeaefc8e6e..abc83fa85bcd 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -2186,6 +2186,8 @@ static void snd_ac97_powerdown(struct snd_ac97 *ac97)
*/
void snd_ac97_suspend(struct snd_ac97 *ac97)
{
+ if (! ac97)
+ return;
if (ac97->build_ops->suspend)
ac97->build_ops->suspend(ac97);
snd_ac97_powerdown(ac97);
@@ -2242,6 +2244,9 @@ void snd_ac97_resume(struct snd_ac97 *ac97)
{
unsigned long end_time;
+ if (! ac97)
+ return;
+
if (ac97->bus->ops->reset) {
ac97->bus->ops->reset(ac97);
goto __reset_ready;