git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
[pandora-kernel.git]
/
drivers
/
pci
/
pcie
/
aer
/
aerdrv.c
diff --git
a/drivers/pci/pcie/aer/aerdrv.c
b/drivers/pci/pcie/aer/aerdrv.c
index
f409948
..
2b2b650
100644
(file)
--- a/
drivers/pci/pcie/aer/aerdrv.c
+++ b/
drivers/pci/pcie/aer/aerdrv.c
@@
-416,7
+416,7
@@
static void aer_error_resume(struct pci_dev *dev)
*/
static int __init aer_service_init(void)
{
- if (!pci_aer_available())
+ if (!pci_aer_available()
|| aer_acpi_firmware_first()
)
return -ENXIO;
return pcie_port_service_register(&aerdriver);
}