summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_generic.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 18:47:01 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-30 18:47:01 +0400
commit444bd6fc18e4788f701a119cdfefe4f02444d9cb (patch)
tree605ad11a825acf4bae9d98973becb3977ac2bae5 /sound/pci/hda/hda_generic.c
parent3cb904caa97f5c193df21b8cdf780a826564baff (diff)
parentc88469704d63787e8d44ca5ea1c1bd0adc29572d (diff)
downloadlinux-444bd6fc18e4788f701a119cdfefe4f02444d9cb.tar.xz
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/hda/hda_generic.c')
-rw-r--r--sound/pci/hda/hda_generic.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 2d046abb5911..1229227af5b5 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -881,6 +881,11 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec)
struct hda_gspec *spec;
int err;
+ if(!codec->afg) {
+ snd_printdd("hda_generic: no generic modem yet\n");
+ return -ENODEV;
+ }
+
spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
if (spec == NULL) {
printk(KERN_ERR "hda_generic: can't allocate spec\n");