libnvdimm: add an atomic vs process context flag to rw_bytes

[sfrench/cifs-2.6.git] / drivers / nvdimm / btt_devs.c

diff --git a/drivers/nvdimm/btt_devs.c b/drivers/nvdimm/btt_devs.c
index 97dd2925ed6e95f1f06ffa6f4a0b5643acd4c07a..ae00dc0d97917392cd3f447d1e3bb937a1a67253 100644 (file)
--- a/drivers/nvdimm/btt_devs.c
+++ b/drivers/nvdimm/btt_devs.c
@@ -273,7 +273,7 @@ static int __nd_btt_probe(struct nd_btt *nd_btt,
        if (!btt_sb || !ndns || !nd_btt)
                return -ENODEV;
 
-       if (nvdimm_read_bytes(ndns, SZ_4K, btt_sb, sizeof(*btt_sb)))
+       if (nvdimm_read_bytes(ndns, SZ_4K, btt_sb, sizeof(*btt_sb), 0))
                return -ENXIO;
 
        if (nvdimm_namespace_capacity(ndns) < SZ_16M)
@@ -314,7 +314,7 @@ int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns)
        if (rc < 0) {
                struct nd_btt *nd_btt = to_nd_btt(btt_dev);
 
-               __nd_detach_ndns(btt_dev, &nd_btt->ndns);
+               nd_detach_ndns(btt_dev, &nd_btt->ndns);
                put_device(btt_dev);
        }