| commit | 11d2498f1568a0f923dc8ef7621de15a9e89267f | [log] [tgz] |
|---|---|---|
| author | Dan Williams <dan.j.williams@intel.com> | Fri Apr 09 22:00:09 2021 -0700 |
| committer | Dan Williams <dan.j.williams@intel.com> | Fri Apr 09 22:00:09 2021 -0700 |
| tree | 692b7d038d587313d2590577c7037a8db29dfbd5 | |
| parent | a2948b17f6b936fc52f86c0f92c46d2f91928b79 [diff] | |
| parent | 9de82caad0282205d4c38a39456bce58e3219540 [diff] |
Merge branch 'for-5.12/dax' into libnvdimm-fixes Pick up dax compile fix.
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 452e85a..5aee26e 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c
@@ -90,13 +90,11 @@ 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)