Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319362
b: refs/heads/master
c: 7a623c0
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Jun 11, 2012
1 parent 2a40c92 commit 53670e0
Show file tree
Hide file tree
Showing 6 changed files with 451 additions and 707 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b0610bb82abd1c4ac97c33f0312cd7fd72eaa325
refs/heads/master: 7a623c039075e4ea21648d88133fafa6dcfd113d
13 changes: 2 additions & 11 deletions trunk/drivers/edac/edac_mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
unsigned size, tot_dimms = 1, count = 1;
unsigned tot_csrows = 1, tot_channels = 1, tot_errcount = 0;
void *pvt, *p, *ptr = NULL;
int i, j, err, row, chn, n, len;
int i, j, row, chn, n, len;
bool per_rank = false;

BUG_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0);
Expand Down Expand Up @@ -374,15 +374,6 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
mci->op_state = OP_ALLOC;
INIT_LIST_HEAD(&mci->grp_kobj_list);

/*
* Initialize the 'root' kobj for the edac_mc controller
*/
err = edac_mc_register_sysfs_main_kobj(mci);
if (err) {
kfree(mci);
return NULL;
}

/* at this point, the root kobj is valid, and in order to
* 'free' the object, then the function:
* edac_mc_unregister_sysfs_main_kobj() must be called
Expand All @@ -403,7 +394,7 @@ void edac_mc_free(struct mem_ctl_info *mci)
{
debugf1("%s()\n", __func__);

edac_mc_unregister_sysfs_main_kobj(mci);
edac_unregister_sysfs(mci);

/* free the mci instance memory here */
kfree(mci);
Expand Down
Loading

0 comments on commit 53670e0

Please sign in to comment.