Merge branch 'edac-urgent' into edac-for-next

Pick up urgent change into next queue. Signed-off-by: Borislav Petkov <bp@suse.de>
mariux64 · Oct 17, 2019 · 3a5e7ec · 3a5e7ec
2 parents 9816b4a + 1e72e67
commit 3a5e7ec
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c
@@ -553,7 +553,11 @@ void ghes_edac_unregister(struct ghes *ghes)
 	if (!ghes_pvt)
 		return;
 
+	if (atomic_dec_return(&ghes_init))
+		return;
+
 	mci = ghes_pvt->mci;
+	ghes_pvt = NULL;
 	edac_mc_del_mc(mci->pdev);
 	edac_mc_free(mci);
 }