summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2021-08-11 12:04:43 -0700
committerDan Williams <dan.j.williams@intel.com>2021-08-11 12:04:43 -0700
commit96dcb97d0a40a60b9aee9f2c7a44ce8a1b6704bc (patch)
tree62a1534997a3b4048c8d4a9f036578a50fff9e49 /drivers
parentf21453b0ff6e307bfd59e7a126d9848cea25315c (diff)
parentb05d4c576b697b9f462b9c532c997171d5c3b067 (diff)
Merge branch 'for-5.14/dax' into libnvdimm-fixes
Pick up some small dax cleanups that make some of Ira's follow on work easier.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dax/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index 5fa6ae9dbc8b..44736cbd446e 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -313,7 +313,7 @@ long dax_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages,
return -ENXIO;
if (nr_pages < 0)
- return nr_pages;
+ return -EINVAL;
avail = dax_dev->ops->direct_access(dax_dev, pgoff, nr_pages,
kaddr, pfn);