diff options
author | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:34 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2018-07-18 17:42:40 +0200 |
commit | 67ece13ffe862f9d17a144c6cd3feef88a57db13 (patch) | |
tree | ec2036681d19a9c10b2fad941eb8f58f9eafcfc8 /arch/x86/kernel/cpu/microcode/intel.c | |
parent | fa84cf094ef9667e2b91c104b0a788fd1896f482 (diff) | |
parent | 4aaf448fa9754e2d5ee188d32327b24ffc15ca4d (diff) |
Merge branch 'topic/vga_switcheroo' into for-next
Pull the vga_switcheroo audio client fix.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/microcode/intel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 1c2cfa0644aa9..97ccf4c3b45be 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -190,8 +190,11 @@ static void save_microcode_patch(void *data, unsigned int size) p = memdup_patch(data, size); if (!p) pr_err("Error allocating buffer %p\n", data); - else + else { list_replace(&iter->plist, &p->plist); + kfree(iter->data); + kfree(iter); + } } } |