Commit-ID: 6c53cbfced048c421e4f72cb2183465f68fbc5e7
Gitweb: http://git.kernel.org/tip/6c53cbfced048c421e4f72cb2183465f68fbc5e7
Author: Borislav Petkov <borislav.petkov@xxxxxxx>
AuthorDate: Thu, 6 Jan 2011 16:56:51 +0100
Committer: Borislav Petkov <borislav.petkov@xxxxxxx>
CommitDate: Wed, 9 Feb 2011 16:05:31 +0100
x86, microcode: Correct sysdev_add error path
When we encounter an error while initting the microcode driver on a CPU,
we must undo the previously added sysfs group.
Cc: Tigran Aivazian <tigran@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <borislav.petkov@xxxxxxx>
Acked-by: Andreas Herrmann <Andreas.Herrmann3@xxxxxxx>
---
arch/x86/kernel/microcode_core.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 1cca374..87af68e 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -417,8 +417,10 @@ static int mc_sysdev_add(struct sys_device *sys_dev)
if (err)
return err;
- if (microcode_init_cpu(cpu) == UCODE_ERROR)
- err = -EINVAL;
+ if (microcode_init_cpu(cpu) == UCODE_ERROR) {
+ sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
+ return -EINVAL;
+ }
return err;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|