projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4.4/topic/mm-kaslr-pax_usercopy' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pci
/
pci.c
diff --git
a/drivers/pci/pci.c
b/drivers/pci/pci.c
index 314db8c1047a30228f68072f820d7f40babc2ad0..e311a9bf2c90d602e3ced4725b22562c733660cf 100644
(file)
--- a/
drivers/pci/pci.c
+++ b/
drivers/pci/pci.c
@@
-2043,6
+2043,10
@@
bool pci_dev_run_wake(struct pci_dev *dev)
if (!dev->pme_support)
return false;
if (!dev->pme_support)
return false;
+ /* PME-capable in principle, but not from the intended sleep state */
+ if (!pci_pme_capable(dev, pci_target_state(dev)))
+ return false;
+
while (bus->parent) {
struct pci_dev *bridge = bus->self;
while (bus->parent) {
struct pci_dev *bridge = bus->self;
@@
-4772,8
+4776,10
@@
int pci_get_new_domain_nr(void)
void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
{
static int use_dt_domains = -1;
void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
{
static int use_dt_domains = -1;
- int domain =
of_get_pci_domain_nr(parent->of_node)
;
+ int domain =
-1
;
+ if (parent)
+ domain = of_get_pci_domain_nr(parent->of_node);
/*
* Check DT domain and use_dt_domains values.
*
/*
* Check DT domain and use_dt_domains values.
*