diff options
Diffstat (limited to 'drivers/edac/i3200_edac.c')
-rw-r--r-- | drivers/edac/i3200_edac.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index 046808c6357d..6ae30176aef5 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c | |||
@@ -319,7 +319,7 @@ static unsigned long drb_to_nr_pages( | |||
319 | static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | 319 | static int i3200_probe1(struct pci_dev *pdev, int dev_idx) |
320 | { | 320 | { |
321 | int rc; | 321 | int rc; |
322 | int i; | 322 | int i, j; |
323 | struct mem_ctl_info *mci = NULL; | 323 | struct mem_ctl_info *mci = NULL; |
324 | unsigned long last_page; | 324 | unsigned long last_page; |
325 | u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL]; | 325 | u16 drbs[I3200_CHANNELS][I3200_RANKS_PER_CHANNEL]; |
@@ -375,20 +375,22 @@ static int i3200_probe1(struct pci_dev *pdev, int dev_idx) | |||
375 | i / I3200_RANKS_PER_CHANNEL, | 375 | i / I3200_RANKS_PER_CHANNEL, |
376 | i % I3200_RANKS_PER_CHANNEL); | 376 | i % I3200_RANKS_PER_CHANNEL); |
377 | 377 | ||
378 | if (nr_pages == 0) { | 378 | if (nr_pages == 0) |
379 | csrow->mtype = MEM_EMPTY; | ||
380 | continue; | 379 | continue; |
381 | } | ||
382 | 380 | ||
383 | csrow->first_page = last_page + 1; | 381 | csrow->first_page = last_page + 1; |
384 | last_page += nr_pages; | 382 | last_page += nr_pages; |
385 | csrow->last_page = last_page; | 383 | csrow->last_page = last_page; |
386 | csrow->nr_pages = nr_pages; | 384 | csrow->nr_pages = nr_pages; |
387 | 385 | ||
388 | csrow->grain = nr_pages << PAGE_SHIFT; | 386 | for (j = 0; j < nr_channels; j++) { |
389 | csrow->mtype = MEM_DDR2; | 387 | struct dimm_info *dimm = csrow->channels[j].dimm; |
390 | csrow->dtype = DEV_UNKNOWN; | 388 | |
391 | csrow->edac_mode = EDAC_UNKNOWN; | 389 | dimm->grain = nr_pages << PAGE_SHIFT; |
390 | dimm->mtype = MEM_DDR2; | ||
391 | dimm->dtype = DEV_UNKNOWN; | ||
392 | dimm->edac_mode = EDAC_UNKNOWN; | ||
393 | } | ||
392 | } | 394 | } |
393 | 395 | ||
394 | i3200_clear_error_info(mci); | 396 | i3200_clear_error_info(mci); |