diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 14:58:26 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-02-14 14:58:26 -0800 |
| commit | ee817acaa01d5c56e5fef396bea05c869b7e9351 (patch) | |
| tree | 32c3c60448806f3754f8b7853ba81666be8cee15 /drivers/cxl | |
| parent | f57aec443c24d2e8e1f3b5b4856aea12ddda4254 (diff) | |
| parent | 8a3d95ea42921a8021b2459e22f91b4f49495e57 (diff) | |
Merge branch 'for-6.3/cxl-ram-region' into cxl/next
Pick up some fixes from exposure of for-6.3/cxl-ram-region in
linux-next.
Diffstat (limited to 'drivers/cxl')
| -rw-r--r-- | drivers/cxl/core/region.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index fe1d8392870e..f29028148806 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2625,10 +2625,9 @@ int cxl_add_to_region(struct cxl_port *root, struct cxl_endpoint_decoder *cxled) cxlr = to_cxl_region(region_dev); mutex_unlock(&cxlrd->range_lock); - if (IS_ERR(cxlr)) { - rc = PTR_ERR(cxlr); + rc = PTR_ERR_OR_ZERO(cxlr); + if (rc) goto out; - } attach_target(cxlr, cxled, -1, TASK_UNINTERRUPTIBLE); |