[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1295882943-11184-3-git-send-email-bp@amd64.org>
Date: Mon, 24 Jan 2011 16:28:58 +0100
From: Borislav Petkov <bp@...64.org>
To: <x86@...nel.org>
Cc: <linux-kernel@...r.kernel.org>,
Borislav Petkov <borislav.petkov@....com>,
Tigran Aivazian <tigran@...azian.fsnet.co.uk>
Subject: [PATCH 2/7] x86, microcode: Correct sysdev_add error path
From: Borislav Petkov <borislav.petkov@....com>
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@...azian.fsnet.co.uk>
Signed-off-by: Borislav Petkov <borislav.petkov@....com>
Acked-by: Andreas Herrmann <Andreas.Herrmann3@....com>
---
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;
}
--
1.7.4.rc2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists