1 files changed, 2 insertions, 2 deletions

diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index f7520b9f909..647218d69f6 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -727,7 +727,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
                         models++;
                 }
         }
-        if (id < 0) {
+        if (id < 0 && quirk) {
                 q = snd_pci_quirk_lookup(codec->bus->pci, quirk);
                 if (q) {
                         id = q->value;
@@ -736,7 +736,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec,
 #endif
                 }
         }
-        if (id < 0) {
+        if (id < 0 && quirk) {
                 for (q = quirk; q->subvendor; q++) {
                         unsigned int vendorid =
                                 q->subdevice | (q->subvendor << 16);