summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/nfit
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2017-05-05 08:38:43 +0200
committerDan Williams <dan.j.williams@intel.com>2017-05-05 08:38:43 +0200
commit736163671bcb163fc82600b46c83dfa89d532d95 (patch)
tree0639dc9d9fa180450b4e8fbda706eaae5f1876da /drivers/acpi/nfit
parentlibnvdimm, pfn: fix 'npfns' vs section alignment (diff)
parentbrd: fix uninitialized use of brd->dax_dev (diff)
downloadlinux-736163671bcb163fc82600b46c83dfa89d532d95.tar.xz
linux-736163671bcb163fc82600b46c83dfa89d532d95.zip
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/nfit')
-rw-r--r--drivers/acpi/nfit/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index 891bd49ada0b..656acb5d7166 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1849,8 +1849,7 @@ static int acpi_nfit_blk_single_io(struct nfit_blk *nfit_blk,
mmio_flush_range((void __force *)
mmio->addr.aperture + offset, c);
- memcpy_from_pmem(iobuf + copied,
- mmio->addr.aperture + offset, c);
+ memcpy(iobuf + copied, mmio->addr.aperture + offset, c);
}
copied += c;