Commit 7d245713 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/generic' 

- Reword 'reg' property error message to account for both missing and
  malformed properties (Jess)

* pci/controller/generic:
  PCI: host-generic: Avoid reporting incorrect 'missing reg property' error
parents 5457880b 3a11167d

drivers/pci/controller/pci-host-common.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct pci_config_window *pci_host_common_ecam_create(struct device *dev, 


	err = of_address_to_resource(dev->of_node, 0, &cfgres);

	if (err) {

		dev_err(dev, "missing \"reg\" property\n");

		dev_err(dev, "missing or malformed \"reg\" property\n");

		return ERR_PTR(err);

	}