cxl/mem: Fix cxl_mem_probe() error exit

The addition of cxl_mem_active() broke error exit scenarios for
cxl_mem_probe(). Return early rather than proceed with disabling
suspend, and update the label name since it is no longer a terminal
"out" label that exits the function.

Fixes: 9ea4dcf498 ("PM: CXL: Disable suspend")
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/165291687176.1426646.15449254938752532784.stgit@dwillia2-xfh
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2022-05-18 16:34:31 -07:00
parent 194d5edadf
commit 76a4121e86
1 changed files with 4 additions and 2 deletions

View File

@ -171,13 +171,15 @@ static int cxl_mem_probe(struct device *dev)
dev_err(dev, "CXL port topology %s not enabled\n",
dev_name(&parent_port->dev));
rc = -ENXIO;
goto out;
goto unlock;
}
rc = create_endpoint(cxlmd, parent_port);
out:
unlock:
device_unlock(&parent_port->dev);
put_device(&parent_port->dev);
if (rc)
return rc;
/*
* The kernel may be operating out of CXL memory on this device,