| Message ID | 20200121115734.7047-1-kishon@ti.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | b0de922af53eede340986a2d05b6cd4b6d6efa43 |
| Headers | show |
| Series | PCI: keystone: Fix error handling when "num-viewport" DT property is not populated | expand |
On Tue, Jan 21, 2020 at 05:27:34PM +0530, Kishon Vijay Abraham I wrote: > Fix error handling when "num-viewport" DT property is not populated. > > Fixes: 23284ad677a94 ("PCI: keystone: Add support for PCIe EP in AM654x Platforms") > Cc: stable@vger.kernel.org # v5.2+ > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/pci/controller/dwc/pci-keystone.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to pci/keystone, thanks. Lorenzo > diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c > index dbe31589eb61..2c127c321080 100644 > --- a/drivers/pci/controller/dwc/pci-keystone.c > +++ b/drivers/pci/controller/dwc/pci-keystone.c > @@ -1357,7 +1357,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) > ret = of_property_read_u32(np, "num-viewport", &num_viewport); > if (ret < 0) { > dev_err(dev, "unable to read *num-viewport* property\n"); > - return ret; > + goto err_get_sync; > } > > /* > -- > 2.17.1 >
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index dbe31589eb61..2c127c321080 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -1357,7 +1357,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) ret = of_property_read_u32(np, "num-viewport", &num_viewport); if (ret < 0) { dev_err(dev, "unable to read *num-viewport* property\n"); - return ret; + goto err_get_sync; } /*
Fix error handling when "num-viewport" DT property is not populated. Fixes: 23284ad677a94 ("PCI: keystone: Add support for PCIe EP in AM654x Platforms") Cc: stable@vger.kernel.org # v5.2+ Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/pci/controller/dwc/pci-keystone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)