Home| summaryrefslogtreecommitdiff |
| author | Jiri Slaby <jslaby@suse.cz> | 2010-04-12 18:23:50 (GMT) |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2010-04-12 18:53:46 (GMT) |
| commit | e55340294b0c40ce9be7a18c45f2966987a4baf6 (patch) (side-by-side diff) | |
| tree | 87dd67f1826a0af3aa85810c63391fd106425a99 | |
| parent | 2efe49485ffdcd293836eb68aac5122de361cd78 (diff) | |
- patches.drivers/pci-express-aer-silence-_OSC.patch: Refresh.rpm-2.6.16.60-0.62
Revert change that removed aerdriver.off=1 possibility (bnc#541560).
suse-commit: 7ff3b3f171cbd5b827a708734d0a10119e5d2c66
| -rw-r--r-- | drivers/pci/pcie/aer/aerdrv_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index cd339bb..b6b917c 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -787,12 +787,14 @@ void aer_delete_rootport(struct aer_rpc *rpc) * @dev: pointer to AER pcie device * * Invoked when AER service driver is loaded. **/ int aer_init(struct pcie_device *dev) { + CHECK_AER_DISABLED(); + if (aer_osc_setup(dev) && !forceload) return -ENXIO; return AER_SUCCESS; } |