1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
index 5a852017c17a..4a16b5b61cfb 100644
--- a/drivers/edac/i5000_edac.c
+++ b/drivers/edac/i5000_edac.c
@@ -1286,16 +1286,6 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
         if (PCI_FUNC(pdev->devfn) != 0)
                 return -ENODEV;
 
-        /* make sure error reporting method is sane */
-        switch (edac_op_state) {
-        case EDAC_OPSTATE_POLL:
-        case EDAC_OPSTATE_NMI:
-                break;
-        default:
-                edac_op_state = EDAC_OPSTATE_POLL;
-                break;
-        }
-
         /* Ask the devices for the number of CSROWS and CHANNELS so
          * that we can calculate the memory resources, etc
          *
@@ -1478,6 +1468,9 @@ static int __init i5000_init(void)
 
         debugf2("MC: " __FILE__ ": %s()\n", __func__);
 
+       /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+       opstate_init();
+
         pci_rc = pci_register_driver(&i5000_driver);
 
         return (pci_rc < 0) ? pci_rc : 0;
@@ -1501,5 +1494,6 @@ MODULE_AUTHOR
     ("Linux Networx (http://lnxi.com) Doug Thompson <norsk5@xmission.com>");
 MODULE_DESCRIPTION("MC Driver for Intel I5000 memory controllers - "
                 I5000_REVISION);
+
 module_param(edac_op_state, int, 0444);
 MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");