1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c
index b095a906a994..2d35b78ada3c 100644
--- a/drivers/edac/pasemi_edac.c
+++ b/drivers/edac/pasemi_edac.c
@@ -74,7 +74,7 @@ static int system_mmc_id;
 
 static u32 pasemi_edac_get_error_info(struct mem_ctl_info *mci)
 {
-        struct pci_dev *pdev = to_pci_dev(mci->dev);
+        struct pci_dev *pdev = to_pci_dev(mci->pdev);
         u32 tmp;
 
         pci_read_config_dword(pdev, MCDEBUG_ERRSTA,
@@ -95,7 +95,7 @@ static u32 pasemi_edac_get_error_info(struct mem_ctl_info *mci)
 
 static void pasemi_edac_process_error_info(struct mem_ctl_info *mci, u32 errsta)
 {
-        struct pci_dev *pdev = to_pci_dev(mci->dev);
+        struct pci_dev *pdev = to_pci_dev(mci->pdev);
         u32 errlog1a;
         u32 cs;
 
@@ -110,16 +110,16 @@ static void pasemi_edac_process_error_info(struct mem_ctl_info *mci, u32 errsta)
         /* uncorrectable/multi-bit errors */
         if (errsta & (MCDEBUG_ERRSTA_MBE_STATUS |
                       MCDEBUG_ERRSTA_RFL_STATUS)) {
-                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci,
-                                     mci->csrows[cs].first_page, 0, 0,
-                                     cs, 0, -1, mci->ctl_name, "", NULL);
+                edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, 1,
+                                     mci->csrows[cs]->first_page, 0, 0,
+                                     cs, 0, -1, mci->ctl_name, "");
         }
 
         /* correctable/single-bit errors */
         if (errsta & MCDEBUG_ERRSTA_SBE_STATUS)
-                edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci,
-                                     mci->csrows[cs].first_page, 0, 0,
-                                     cs, 0, -1, mci->ctl_name, "", NULL);
+                edac_mc_handle_error(HW_EVENT_ERR_CORRECTED, mci, 1,
+                                     mci->csrows[cs]->first_page, 0, 0,
+                                     cs, 0, -1, mci->ctl_name, "");
 }
 
 static void pasemi_edac_check(struct mem_ctl_info *mci)
@@ -141,8 +141,8 @@ static int pasemi_edac_init_csrows(struct mem_ctl_info *mci,
         int index;
 
         for (index = 0; index < mci->nr_csrows; index++) {
-                csrow = &mci->csrows[index];
-                dimm = csrow->channels[0].dimm;
+                csrow = mci->csrows[index];
+                dimm = csrow->channels[0]->dimm;
 
                 pci_read_config_dword(pdev,
                                       MCDRAM_RANKCFG + (index * 12),
@@ -225,7 +225,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev,
                 MCCFG_ERRCOR_ECC_GEN_EN |
                 MCCFG_ERRCOR_ECC_CRR_EN;
 
-        mci->dev = &pdev->dev;
+        mci->pdev = &pdev->dev;
         mci->mtype_cap = MEM_FLAG_DDR | MEM_FLAG_RDDR;
         mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED;
         mci->edac_cap = (errcor & MCCFG_ERRCOR_ECC_GEN_EN) ?