diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2026-04-13 20:50:09 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2026-04-13 20:50:09 +0300 |
| commit | 7dde59ebdadd3543ece73f971c3f64f872d4ce63 (patch) | |
| tree | 5338866a2e5bacc07610da3b363481050f117543 | |
| parent | 9120557a9d32c436ee3aebafcc957d3c9ac492cd (diff) | |
| parent | 99d986686331ba3fd58dffb312e282d2bf81ee72 (diff) | |
| download | linux-7dde59ebdadd3543ece73f971c3f64f872d4ce63.tar.xz | |
Merge branch 'pci/controller/cadence-sky1'
- Release ECAM config on probe failure (Felix Gu)
* pci/controller/cadence-sky1:
PCI: sky1: Use boolean true for is_rc field
PCI: sky1: Fix missing cleanup of ECAM config on probe failure
| -rw-r--r-- | drivers/pci/controller/cadence/pci-sky1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pci/controller/cadence/pci-sky1.c b/drivers/pci/controller/cadence/pci-sky1.c index d8c216dc120d..cd55c64e58a9 100644 --- a/drivers/pci/controller/cadence/pci-sky1.c +++ b/drivers/pci/controller/cadence/pci-sky1.c @@ -173,11 +173,13 @@ static int sky1_pcie_probe(struct platform_device *pdev) cdns_pcie->ops = &sky1_pcie_ops; cdns_pcie->reg_base = pcie->reg_base; cdns_pcie->msg_res = pcie->msg_res; - cdns_pcie->is_rc = 1; + cdns_pcie->is_rc = true; reg_off = devm_kzalloc(dev, sizeof(*reg_off), GFP_KERNEL); - if (!reg_off) + if (!reg_off) { + pci_ecam_free(pcie->cfg); return -ENOMEM; + } reg_off->ip_reg_bank_offset = SKY1_IP_REG_BANK; reg_off->ip_cfg_ctrl_reg_offset = SKY1_IP_CFG_CTRL_REG_BANK; |