diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-08-14 09:15:52 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2007-10-16 09:58:55 -0400 |
commit | 9d99f312629802f4c45306ee07618ee4978b4adc (patch) | |
tree | d3fdd0446e1b581e570336b5e12dd08f0b6b7d09 /sound/pci/hda/hda_codec.c | |
parent | 918f3a0e8cf67b5db966516f255eaf24d814fac0 (diff) |
[ALSA] hda-intel - Fix NULL dereference in resume
codec->patch_ops.init can be NULL. Check before calling it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index efd56a3396bd..fc1ddf408b9b 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1677,7 +1677,8 @@ static void hda_call_codec_resume(struct hda_codec *codec) | |||
1677 | if (codec->patch_ops.resume) | 1677 | if (codec->patch_ops.resume) |
1678 | codec->patch_ops.resume(codec); | 1678 | codec->patch_ops.resume(codec); |
1679 | else { | 1679 | else { |
1680 | codec->patch_ops.init(codec); | 1680 | if (codec->patch_ops.init) |
1681 | codec->patch_ops.init(codec); | ||
1681 | snd_hda_codec_resume_amp(codec); | 1682 | snd_hda_codec_resume_amp(codec); |
1682 | snd_hda_codec_resume_cache(codec); | 1683 | snd_hda_codec_resume_cache(codec); |
1683 | } | 1684 | } |