Merge branch 'upstream'

1 files changed, 2 insertions, 4 deletions

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 5b829a1a4c60..d0eb9f2250aa 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -881,10 +881,8 @@ 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;
-        }
+        if(!codec->afg)
+                return 0;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL) {