diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-17 12:51:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-17 12:51:14 +0800 |
| commit | 6d0b88c88bf58bfd89ffbdaa97b03617fe8c6478 (patch) | |
| tree | 706c149c0f0d6865d14e6b18058826f9dfd49f24 /drivers/pci/pci.c | |
| parent | 258181e60ef13001b0ae05cb58079fd79ed86a46 (diff) | |
| parent | 0d1912303e54ed1b2a371be0bba51c384dd57326 (diff) | |
Merge tag 'v4.4.6' into linux-linaro-lsk-v4.4
This is the 4.4.6 stable release
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 314db8c1047a..42d8617352ae 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4772,8 +4772,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; - 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. * |