Skip to content

Commit f8851cb

Browse files
committed
Merge tag 'edac_updates_for_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC updates from Tony Luck: "Boris is on vacation and aske me to send you the EDAC changes" * tag 'edac_updates_for_5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: EDAC: Fix reference count leaks EDAC: Remove edac_get_dimm_by_index() EDAC/ghes: Scan the system once on driver init EDAC/ghes: Remove unused members of struct ghes_edac_pvt, rename it to ghes_pvt EDAC/ghes: Setup DIMM label from DMI and use it in error reports EDAC, {skx,i10nm}: Use CPU stepping macro to pass configurations EDAC/mc: Call edac_inc_ue_error() before panic EDAC, pnd2: Set MCE_PRIO_EDAC priority for pnd2_mce_dec notifier
2 parents d4db4e5 + 0f959e1 commit f8851cb

File tree

8 files changed

+211
-163
lines changed

8 files changed

+211
-163
lines changed

drivers/edac/edac_device_sysfs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
275275

276276
/* Error exit stack */
277277
err_kobj_reg:
278+
kobject_put(&edac_dev->kobj);
278279
module_put(edac_dev->owner);
279280

280281
err_out:

drivers/edac/edac_mc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,8 @@ static void edac_ue_error(struct edac_raw_error_desc *e)
950950
e->other_detail);
951951
}
952952

953+
edac_inc_ue_error(e);
954+
953955
if (edac_mc_get_panic_on_ue()) {
954956
panic("UE %s%son %s (%s page:0x%lx offset:0x%lx grain:%ld%s%s)\n",
955957
e->msg,
@@ -959,8 +961,6 @@ static void edac_ue_error(struct edac_raw_error_desc *e)
959961
*e->other_detail ? " - " : "",
960962
e->other_detail);
961963
}
962-
963-
edac_inc_ue_error(e);
964964
}
965965

966966
static void edac_inc_csrow(struct edac_raw_error_desc *e, int row, int chan)

drivers/edac/edac_pci_sysfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ static int edac_pci_main_kobj_setup(void)
386386

387387
/* Error unwind statck */
388388
kobject_init_and_add_fail:
389-
kfree(edac_pci_top_main_kobj);
389+
kobject_put(edac_pci_top_main_kobj);
390390

391391
kzalloc_fail:
392392
module_put(THIS_MODULE);

0 commit comments

Comments
 (0)