diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-09 21:34:10 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-09 21:34:10 +0200 |
| commit | f76ea574d615cd003b2fc51580006f7dc220897c (patch) | |
| tree | 599cd3ee2975f41304a51993d461365e98272714 | |
| parent | Linux 4.0-rc1 (diff) | |
| download | linux-f76ea574d615cd003b2fc51580006f7dc220897c.tar.xz linux-f76ea574d615cd003b2fc51580006f7dc220897c.zip | |
PCI: keystone: Don't dereference possible NULL pointer
Check for failure from platform_get_resource() (this check actually happens
inside devm_ioremap_resource()) before dereferencing the pointer returned
from platform_get_resource().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
| -rw-r--r-- | drivers/pci/host/pci-keystone-dw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c index 66d8ea41b972..f34892e0edb4 100644 --- a/drivers/pci/host/pci-keystone-dw.c +++ b/drivers/pci/host/pci-keystone-dw.c @@ -496,11 +496,12 @@ int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, /* Index 1 is the application reg. space address */ res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - ks_pcie->app = *res; ks_pcie->va_app_base = devm_ioremap_resource(pp->dev, res); if (IS_ERR(ks_pcie->va_app_base)) return PTR_ERR(ks_pcie->va_app_base); + ks_pcie->app = *res; + /* Create legacy IRQ domain */ ks_pcie->legacy_irq_domain = irq_domain_add_linear(ks_pcie->legacy_intc_np, |