lkml.org 
[lkml]   [2021]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v3 03/10] cxl/pci: Fix NULL vs ERR_PTR confusion
    From
    Date
    cxl_pci_map_regblock() may return an ERR_PTR(), but cxl_pci_setup_regs()
    is only prepared for NULL as the error case.

    Fixes: f8a7e8c29be8 ("cxl/pci: Reserve all device regions at once")
    Cc: <stable@vger.kernel.org>
    Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Cc: Ira Weiny <ira.weiny@intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    ---
    drivers/cxl/pci.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
    index ccc7c2573ddc..9c178002d49e 100644
    --- a/drivers/cxl/pci.c
    +++ b/drivers/cxl/pci.c
    @@ -317,7 +317,7 @@ static void __iomem *cxl_pci_map_regblock(struct cxl_mem *cxlm,
    if (pci_resource_len(pdev, bar) < offset) {
    dev_err(dev, "BAR%d: %pr: too small (offset: %#llx)\n", bar,
    &pdev->resource[bar], (unsigned long long)offset);
    - return IOMEM_ERR_PTR(-ENXIO);
    + return NULL;
    }

    addr = pci_iomap(pdev, bar, 0);
    \
     
     \ /
      Last update: 2021-10-09 18:45    [W:8.376 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site