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

[~andy/linux] / drivers / edac / edac_pci.c

diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index ee87ef972ead7667a60a1359e9347e9ebaf60bda..dd370f92ace3402321bbc6f94cfd6814cbb3fb4f 100644 (file)
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -470,7 +470,8 @@ struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev,
 
        pci->mod_name = mod_name;
        pci->ctl_name = EDAC_PCI_GENCTL_NAME;
-       pci->edac_check = edac_pci_generic_check;
+       if (edac_op_state == EDAC_OPSTATE_POLL)
+               pci->edac_check = edac_pci_generic_check;
 
        pdata->edac_idx = edac_pci_idx++;