Commit 93f32da3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/plda' 

- Return -ENOMEM directly instead of using dev_err_probe() (Xichao Zhao)

* pci/controller/plda:
  PCI: plda: Remove dev_err_probe() when the errno is -ENOMEM
parents dde4b05e 882569dc

drivers/pci/controller/plda/pcie-plda-host.c

+1 −2
Original line number Diff line number Diff line
@@ -599,8 +599,7 @@ int plda_pcie_host_init(struct plda_pcie_rp *port, struct pci_ops *ops, 


	bridge = devm_pci_alloc_host_bridge(dev, 0);

	if (!bridge)

		return dev_err_probe(dev, -ENOMEM,

				     "failed to alloc bridge\n");

		return -ENOMEM;



	if (port->host_ops && port->host_ops->host_init) {

		ret = port->host_ops->host_init(port);