Commit 5058cbf2c45c27e6f56f7a30b0bbe69efbd09936
Exists in
master
and in
7 other branches
Merge branch 'fix/misc' into for-linus
Showing 2 changed files Side-by-side Diff
sound/core/pcm_lib.c
| ... | ... | @@ -1070,8 +1070,10 @@ |
| 1070 | 1070 | struct snd_pcm_hw_rule *new; |
| 1071 | 1071 | unsigned int new_rules = constrs->rules_all + 16; |
| 1072 | 1072 | new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL); |
| 1073 | - if (!new) | |
| 1073 | + if (!new) { | |
| 1074 | + va_end(args); | |
| 1074 | 1075 | return -ENOMEM; |
| 1076 | + } | |
| 1075 | 1077 | if (constrs->rules) { |
| 1076 | 1078 | memcpy(new, constrs->rules, |
| 1077 | 1079 | constrs->rules_num * sizeof(*c)); |
| 1078 | 1080 | |
| ... | ... | @@ -1087,8 +1089,10 @@ |
| 1087 | 1089 | c->private = private; |
| 1088 | 1090 | k = 0; |
| 1089 | 1091 | while (1) { |
| 1090 | - if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) | |
| 1092 | + if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) { | |
| 1093 | + va_end(args); | |
| 1091 | 1094 | return -EINVAL; |
| 1095 | + } | |
| 1092 | 1096 | c->deps[k++] = dep; |
| 1093 | 1097 | if (dep < 0) |
| 1094 | 1098 | break; |
| ... | ... | @@ -1097,7 +1101,7 @@ |
| 1097 | 1101 | constrs->rules_num++; |
| 1098 | 1102 | va_end(args); |
| 1099 | 1103 | return 0; |
| 1100 | -} | |
| 1104 | +} | |
| 1101 | 1105 | |
| 1102 | 1106 | EXPORT_SYMBOL(snd_pcm_hw_rule_add); |
| 1103 | 1107 |
sound/pci/hda/patch_realtek.c
| ... | ... | @@ -14807,7 +14807,7 @@ |
| 14807 | 14807 | enum { |
| 14808 | 14808 | ALC269_FIXUP_SONY_VAIO, |
| 14809 | 14809 | ALC269_FIXUP_DELL_M101Z, |
| 14810 | - ALC269_FIXUP_LENOVO_EDGE14, | |
| 14810 | + ALC269_FIXUP_SKU_IGNORE, | |
| 14811 | 14811 | ALC269_FIXUP_ASUS_G73JW, |
| 14812 | 14812 | }; |
| 14813 | 14813 | |
| ... | ... | @@ -14826,7 +14826,7 @@ |
| 14826 | 14826 | {} |
| 14827 | 14827 | } |
| 14828 | 14828 | }, |
| 14829 | - [ALC269_FIXUP_LENOVO_EDGE14] = { | |
| 14829 | + [ALC269_FIXUP_SKU_IGNORE] = { | |
| 14830 | 14830 | .sku = ALC_FIXUP_SKU_IGNORE, |
| 14831 | 14831 | }, |
| 14832 | 14832 | [ALC269_FIXUP_ASUS_G73JW] = { |
| ... | ... | @@ -14840,7 +14840,8 @@ |
| 14840 | 14840 | static struct snd_pci_quirk alc269_fixup_tbl[] = { |
| 14841 | 14841 | SND_PCI_QUIRK_VENDOR(0x104d, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), |
| 14842 | 14842 | SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), |
| 14843 | - SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_LENOVO_EDGE14), | |
| 14843 | + SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE), | |
| 14844 | + SND_PCI_QUIRK(0x17aa, 0x20f2, "Thinkpad SL410/510", ALC269_FIXUP_SKU_IGNORE), | |
| 14844 | 14845 | SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), |
| 14845 | 14846 | {} |
| 14846 | 14847 | }; |