lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 253/477] PCI: dwc: pci-dra7xx: Use devm_platform_ioremap_resource_byname()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit c8a119779f5609de8dcd98630f71cc7f1b2e4e8c ]

    platform_get_resource() may fail and return NULL, so we had better
    check its return value to avoid a NULL pointer dereference a bit later
    in the code. Fix it to use devm_platform_ioremap_resource_byname()
    instead of calling platform_get_resource_byname() and devm_ioremap().

    Link: https://lore.kernel.org/r/20200429015027.134485-1-weiyongjun1@huawei.com
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    [lorenzo.pieralisi@arm.com: commit log]
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/dwc/pci-dra7xx.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controller/dwc/pci-dra7xx.c
    index 3b0e58f2de588..6184ebc9392db 100644
    --- a/drivers/pci/controller/dwc/pci-dra7xx.c
    +++ b/drivers/pci/controller/dwc/pci-dra7xx.c
    @@ -840,7 +840,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
    struct phy **phy;
    struct device_link **link;
    void __iomem *base;
    - struct resource *res;
    struct dw_pcie *pci;
    struct dra7xx_pcie *dra7xx;
    struct device *dev = &pdev->dev;
    @@ -877,10 +876,9 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
    return irq;
    }

    - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ti_conf");
    - base = devm_ioremap(dev, res->start, resource_size(res));
    - if (!base)
    - return -ENOMEM;
    + base = devm_platform_ioremap_resource_byname(pdev, "ti_conf");
    + if (IS_ERR(base))
    + return PTR_ERR(base);

    phy_count = of_property_count_strings(np, "phy-names");
    if (phy_count < 0) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:12    [W:4.242 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site