Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / drivers / edac / pasemi_edac.c

diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c
index 4fcf23b61d8e44bdb9ae29a88e3704a6203110fe..9007d0677220cf3aef8a524608d345452820ba6b 100644 (file)
--- a/drivers/edac/pasemi_edac.c
+++ b/drivers/edac/pasemi_edac.c
@@ -205,7 +205,8 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev,
                MCDEBUG_ERRCTL1_RFL_LOG_EN;
        pci_write_config_dword(pdev, MCDEBUG_ERRCTL1, errctl1);
 
-       mci = edac_mc_alloc(0, PASEMI_EDAC_NR_CSROWS, PASEMI_EDAC_NR_CHANS);
+       mci = edac_mc_alloc(0, PASEMI_EDAC_NR_CSROWS, PASEMI_EDAC_NR_CHANS,
+                               system_mmc_id++);
 
        if (mci == NULL)
                return -ENOMEM;
@@ -245,7 +246,7 @@ static int __devinit pasemi_edac_probe(struct pci_dev *pdev,
         */
        pasemi_edac_get_error_info(mci);
 
-       if (edac_mc_add_mc(mci, system_mmc_id++))
+       if (edac_mc_add_mc(mci))
                goto fail;
 
        /* get this far and it's successful */
@@ -269,6 +270,7 @@ static void __devexit pasemi_edac_remove(struct pci_dev *pdev)
 
 static const struct pci_device_id pasemi_edac_pci_tbl[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa00a) },
+       { }
 };
 
 MODULE_DEVICE_TABLE(pci, pasemi_edac_pci_tbl);