Commit 10d97b74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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()
parents 35bdc192 51520e03

drivers/edac/edac_mc.c

+3 −3
Original line number Diff line number Diff line
@@ -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;