diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2021-04-09 22:00:09 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-04-09 22:00:09 -0700 |
| commit | 11d2498f1568a0f923dc8ef7621de15a9e89267f (patch) | |
| tree | 692b7d038d587313d2590577c7037a8db29dfbd5 | |
| parent | libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC (diff) | |
| parent | dax: avoid -Wempty-body warnings (diff) | |
| download | wireguard-linux-11d2498f1568a0f923dc8ef7621de15a9e89267f.tar.xz wireguard-linux-11d2498f1568a0f923dc8ef7621de15a9e89267f.zip | |
Merge branch 'for-5.12/dax' into libnvdimm-fixes
Pick up dax compile fix.
| -rw-r--r-- | drivers/dax/bus.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 452e85ae87a8..5aee26e1bbd6 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -90,13 +90,11 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf, list_add(&dax_id->list, &dax_drv->ids); } else rc = -ENOMEM; - } else - /* nothing to remove */; + } } else if (action == ID_REMOVE) { list_del(&dax_id->list); kfree(dax_id); - } else - /* dax_id already added */; + } mutex_unlock(&dax_bus_lock); if (rc < 0) |