]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] hda-intel - Fix NULL dereference in resume
authorTakashi Iwai <tiwai@suse.de>
Tue, 14 Aug 2007 13:15:52 +0000 (15:15 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 16 Oct 2007 13:58:55 +0000 (15:58 +0200)
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>
sound/pci/hda/hda_codec.c

index efd56a3396bda0946bfcac2b8e2c4c18b273ea51..fc1ddf408b9ba7de6d42c56dfa0ffbc74afaeaf8 100644 (file)
@@ -1677,7 +1677,8 @@ static void hda_call_codec_resume(struct hda_codec *codec)
        if (codec->patch_ops.resume)
                codec->patch_ops.resume(codec);
        else {
-               codec->patch_ops.init(codec);
+               if (codec->patch_ops.init)
+                       codec->patch_ops.init(codec);
                snd_hda_codec_resume_amp(codec);
                snd_hda_codec_resume_cache(codec);
        }