From 82c2ea564a7f544a905c940b8591b16c75d195e1 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 17 Nov 2005 16:00:01 +0100 Subject: [PATCH] --- yaml --- r: 16045 b: refs/heads/master c: e26e7545e9542425f140cb4c605a7ab5a3b13e00 h: refs/heads/master i: 16043: cc500ce149b51cf3f1182a6cebf080d3a1aff2c9 v: v3 --- [refs] | 2 +- trunk/sound/pci/ac97/ac97_codec.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 40dc96e431dc..7b6a77b36ee0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 603bf524aa4cba95e4fcd64dbfffc41f804c65ab +refs/heads/master: e26e7545e9542425f140cb4c605a7ab5a3b13e00 diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c index 9faeaefc8e6e..abc83fa85bcd 100644 --- a/trunk/sound/pci/ac97/ac97_codec.c +++ b/trunk/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;