diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:55:17 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:55:17 -0700 |
| commit | f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5 (patch) | |
| tree | fe4dfcaafe847b71ebd040f348c0a2ee8206b38a /drivers/dax/bus.c | |
| parent | d3b88655c0a157c11370b8faf50e82ecb1c17d54 (diff) | |
| parent | 4e4ced93794acb42adb19484132966defba8f3a6 (diff) | |
| download | linux-f6d2b802f80d0ca89ee1f51c1781b3f79cdb25d5.tar.bz2 | |
Merge branch 'for-5.7/libnvdimm' into libnvdimm-for-next
- Introduce 'zero_page_range' as a dax operation. This facilitates
filesystem-dax operation without a block-device.
- Advertise a persistence-domain for of_pmem and papr_scm. The
persistence domain indicates where cpu-store cycles need to reach in
the platform-memory subsystem before the platform will consider them
power-fail protected.
- Fixup some flexible-array declarations.
Diffstat (limited to 'drivers/dax/bus.c')
| -rw-r--r-- | drivers/dax/bus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 46e46047a1f7..df238c8b6ef2 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -421,8 +421,10 @@ struct dev_dax *__devm_create_dev_dax(struct dax_region *dax_region, int id, * device outside of mmap of the resulting character device. */ dax_dev = alloc_dax(dev_dax, NULL, NULL, DAXDEV_F_SYNC); - if (!dax_dev) + if (IS_ERR(dax_dev)) { + rc = PTR_ERR(dax_dev); goto err; + } /* a device_dax instance is dead while the driver is not attached */ kill_dax(dax_dev); |