Merge tag 'edac_urgent_for_7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

10d97b74 · Linus Torvalds <[email protected]> · 2026-04-12 11:56:07 -07:00

Pull EDAC fix from Borislav Petkov:

 - Fix the error path ordering when the driver-private descriptor
   allocation fails

* tag 'edac_urgent_for_7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  EDAC/mc: Fix error path ordering in edac_mc_alloc()

Commit: 10d97b74e2eef787d823f9bc05cb044b47d25c41
Parents: 35bdc192 · 51520e03

Merge commit. Changes below are compared with the first parent: 35bdc192.

Changes

1 files changed · +3 −3

File	Status	Add	Del	Content
drivers/edac/edac_mc.c	modified	+3	−3	View file

drivers/edac/edac_mc.c

View file

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 29e9828..11d6633 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -369,13 +369,13 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num,
 	if (!mci->layers)
 		goto error;
 
+	mci->dev.release = mci_release;
+	device_initialize(&mci->dev);
+
 	mci->pvt_info = kzalloc(sz_pvt, GFP_KERNEL);
 	if (!mci->pvt_info)
 		goto error;
 
-	mci->dev.release = mci_release;
-	device_initialize(&mci->dev);
-
 	/* setup index and various internal pointers */
 	mci->mc_idx = mc_num;
 	mci->tot_dimms = tot_dimms;