Merge branch 'fix/misc' into for-linus

2 files changed, 11 insertions, 6 deletions

diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index b75db8e9cc0f..11446a1506da 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1070,8 +1070,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
                 struct snd_pcm_hw_rule *new;
                 unsigned int new_rules = constrs->rules_all + 16;
                 new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);
-                if (!new)
+                if (!new) {
+                        va_end(args);
                         return -ENOMEM;
+                }
                 if (constrs->rules) {
                         memcpy(new, constrs->rules,
                                constrs->rules_num * sizeof(*c));
@@ -1087,8 +1089,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
         c->private = private;
         k = 0;
         while (1) {
-                if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps)))
+                if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) {
+                        va_end(args);
                         return -EINVAL;
+                }
                 c->deps[k++] = dep;
                 if (dep < 0)
                         break;
@@ -1097,7 +1101,7 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
         constrs->rules_num++;
         va_end(args);
         return 0;
-}                                   
+}
 
 EXPORT_SYMBOL(snd_pcm_hw_rule_add);
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 427da45d7906..dd56d8833ad2 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -14807,7 +14807,7 @@ static int alc269_resume(struct hda_codec *codec)
 enum {
         ALC269_FIXUP_SONY_VAIO,
         ALC269_FIXUP_DELL_M101Z,
-        ALC269_FIXUP_LENOVO_EDGE14,
+        ALC269_FIXUP_SKU_IGNORE,
         ALC269_FIXUP_ASUS_G73JW,
 };
 
@@ -14826,7 +14826,7 @@ static const struct alc_fixup alc269_fixups[] = {
                         {}
                 }
         },
-        [ALC269_FIXUP_LENOVO_EDGE14] = {
+        [ALC269_FIXUP_SKU_IGNORE] = {
                 .sku = ALC_FIXUP_SKU_IGNORE,
         },
         [ALC269_FIXUP_ASUS_G73JW] = {
@@ -14840,7 +14840,8 @@ static const struct alc_fixup alc269_fixups[] = {
 static struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),
         SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z),
-        SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_LENOVO_EDGE14),
+        SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
         {}
 };