diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-10 22:24:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-24 09:20:37 -0400 |
commit | 6ee7dd504490f3dc25cfe1c9be5b6e8895f89a92 (patch) | |
tree | 1ad8d757ecccbcc79c54dfc5ffb0097049f5d65d /drivers/edac | |
parent | 3cfd01468b98360ede8cc8849d14e586253d290c (diff) |
i7core_edac: Initialize all priv vars before start polling
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/edac')
-rw-r--r-- | drivers/edac/i7core_edac.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c index a05f166d8917..d2b2ed8915fd 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, | |||
1941 | goto fail; | 1941 | goto fail; |
1942 | } | 1942 | } |
1943 | 1943 | ||
1944 | /* allocating generic PCI control info */ | ||
1945 | pvt->i7core_pci = edac_pci_create_generic_ctl(&i7core_dev->pdev[0]->dev, | ||
1946 | EDAC_MOD_STR); | ||
1947 | if (unlikely(!pvt->i7core_pci)) { | ||
1948 | printk(KERN_WARNING | ||
1949 | "%s(): Unable to create PCI control\n", | ||
1950 | __func__); | ||
1951 | printk(KERN_WARNING | ||
1952 | "%s(): PCI error report via EDAC not setup\n", | ||
1953 | __func__); | ||
1954 | } | ||
1955 | |||
1956 | /* Default error mask is any memory */ | 1944 | /* Default error mask is any memory */ |
1957 | pvt->inject.channel = 0; | 1945 | pvt->inject.channel = 0; |
1958 | pvt->inject.dimm = -1; | 1946 | pvt->inject.dimm = -1; |
@@ -1965,6 +1953,18 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev, | |||
1965 | pvt->edac_mce.priv = mci; | 1953 | pvt->edac_mce.priv = mci; |
1966 | pvt->edac_mce.check_error = i7core_mce_check_error; | 1954 | pvt->edac_mce.check_error = i7core_mce_check_error; |
1967 | 1955 | ||
1956 | /* allocating generic PCI control info */ | ||
1957 | pvt->i7core_pci = edac_pci_create_generic_ctl(&i7core_dev->pdev[0]->dev, | ||
1958 | EDAC_MOD_STR); | ||
1959 | if (unlikely(!pvt->i7core_pci)) { | ||
1960 | printk(KERN_WARNING | ||
1961 | "%s(): Unable to create PCI control\n", | ||
1962 | __func__); | ||
1963 | printk(KERN_WARNING | ||
1964 | "%s(): PCI error report via EDAC not setup\n", | ||
1965 | __func__); | ||
1966 | } | ||
1967 | |||
1968 | rc = edac_mce_register(&pvt->edac_mce); | 1968 | rc = edac_mce_register(&pvt->edac_mce); |
1969 | if (unlikely(rc < 0)) { | 1969 | if (unlikely(rc < 0)) { |
1970 | debugf0("MC: " __FILE__ | 1970 | debugf0("MC: " __FILE__ |