summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2012-09-10 15:52:27 +0200
committerBorislav Petkov <bp@alien8.de>2012-11-28 11:22:47 +0100
commit876bb331e26b970c2d8caea2c1d1209fdae953d0 (patch)
tree22c21663ff027ca0e55890ce54c5a7706dff17ad /drivers
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff)
downloadlinux-stable-876bb331e26b970c2d8caea2c1d1209fdae953d0.tar.gz
linux-stable-876bb331e26b970c2d8caea2c1d1209fdae953d0.tar.bz2
linux-stable-876bb331e26b970c2d8caea2c1d1209fdae953d0.zip
EDAC: Respect operational state in edac_pci.c
Currently, we unconditionally enable PCI polling and we don't look at the edac_op_state module parameter. Make this dependent on the parameter setting supplied on the command line. Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/edac/edac_pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index ee87ef972ead..dd370f92ace3 100644
--- 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++;