From: Mauro Carvalho Chehab Date: Wed, 11 Aug 2010 02:24:16 +0000 (-0300) Subject: i7core_edac: Initialize all priv vars before start polling X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=6ee7dd504490f3dc25cfe1c9be5b6e8895f89a92;p=linux-edison.git i7core_edac: Initialize all priv vars before start polling Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index a05f166d891..d2b2ed8915f 100644 --- a/drivers/edac/i7core_edac.c +++ b/drivers/edac/i7core_edac.c @@ -1941,18 +1941,6 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev, goto fail; } - /* allocating generic PCI control info */ - pvt->i7core_pci = edac_pci_create_generic_ctl(&i7core_dev->pdev[0]->dev, - EDAC_MOD_STR); - if (unlikely(!pvt->i7core_pci)) { - printk(KERN_WARNING - "%s(): Unable to create PCI control\n", - __func__); - printk(KERN_WARNING - "%s(): PCI error report via EDAC not setup\n", - __func__); - } - /* Default error mask is any memory */ pvt->inject.channel = 0; pvt->inject.dimm = -1; @@ -1965,6 +1953,18 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev, pvt->edac_mce.priv = mci; pvt->edac_mce.check_error = i7core_mce_check_error; + /* allocating generic PCI control info */ + pvt->i7core_pci = edac_pci_create_generic_ctl(&i7core_dev->pdev[0]->dev, + EDAC_MOD_STR); + if (unlikely(!pvt->i7core_pci)) { + printk(KERN_WARNING + "%s(): Unable to create PCI control\n", + __func__); + printk(KERN_WARNING + "%s(): PCI error report via EDAC not setup\n", + __func__); + } + rc = edac_mce_register(&pvt->edac_mce); if (unlikely(rc < 0)) { debugf0("MC: " __FILE__