diff options
| author | Thomas Gleixner | 2019-06-22 12:07:35 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-06-22 12:07:35 +0200 |
| commit | 6808acb57a286cda48d8674713e672681ca7ffb3 (patch) | |
| tree | 77ca408d2453069f6caec40053c4a20e60594c32 /tools/testing | |
| parent | kselftests: timers: freq-step: Update maximum acceptable precision and errors (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-6808acb57a286cda48d8674713e672681ca7ffb3.tar.gz kernel-qcow2-linux-6808acb57a286cda48d8674713e672681ca7ffb3.tar.xz kernel-qcow2-linux-6808acb57a286cda48d8674713e672681ca7ffb3.zip | |
Merge branch 'linus' into timers/core
Pick up upstream fixes for pending changes.
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/nvdimm/test/iomap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/nvdimm/test/iomap.c b/tools/testing/nvdimm/test/iomap.c index 280015c22598..076df22e4bda 100644 --- a/tools/testing/nvdimm/test/iomap.c +++ b/tools/testing/nvdimm/test/iomap.c @@ -100,7 +100,9 @@ static void nfit_test_kill(void *_pgmap) { struct dev_pagemap *pgmap = _pgmap; + WARN_ON(!pgmap || !pgmap->ref || !pgmap->kill || !pgmap->cleanup); pgmap->kill(pgmap->ref); + pgmap->cleanup(pgmap->ref); } void *__wrap_devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) |