diff options
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/bus.c | 2 | ||||
| -rw-r--r-- | drivers/dax/kmem.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index ccfe65004888..b809e1a264af 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -670,7 +670,7 @@ struct dax_region *alloc_dax_region(struct device *parent, int region_id, rc = request_resource(&dax_regions, &dax_region->res); if (rc) { - dev_dbg(parent, "dax_region resource conflict for %pR\n", + dev_err(parent, "dax_region resource conflict for %pR\n", &dax_region->res); goto err_res; } diff --git a/drivers/dax/kmem.c b/drivers/dax/kmem.c index 2cc8749bc871..a18e2b968e4d 100644 --- a/drivers/dax/kmem.c +++ b/drivers/dax/kmem.c @@ -227,6 +227,12 @@ static void dev_dax_kmem_remove(struct dev_dax *dev_dax) if (rc) continue; + /* range was never added during probe */ + if (!data->res[i]) { + success++; + continue; + } + rc = remove_memory(range.start, range_len(&range)); if (rc == 0) { remove_resource(data->res[i]); |