X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=kernel%2Ftools%2Ftesting%2Fnvdimm%2Ftest%2Fnfit.c;fp=kernel%2Ftools%2Ftesting%2Fnvdimm%2Ftest%2Fnfit.c;h=f0d1c8ff8e8ab91074c79f68038723bf4112743c;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=51cf8256c6cda1b8c28cf4393496a77b63e0c171;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/tools/testing/nvdimm/test/nfit.c b/kernel/tools/testing/nvdimm/test/nfit.c
index 51cf8256c..f0d1c8ff8 100644
--- a/kernel/tools/testing/nvdimm/test/nfit.c
+++ b/kernel/tools/testing/nvdimm/test/nfit.c
@@ -13,6 +13,7 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
+#include <linux/workqueue.h>
 #include <linux/libnvdimm.h>
 #include <linux/vmalloc.h>
 #include <linux/device.h>
@@ -1246,6 +1247,7 @@ static int nfit_test_probe(struct platform_device *pdev)
 	if (nfit_test->setup != nfit_test0_setup)
 		return 0;
 
+	flush_work(&acpi_desc->work);
 	nfit_test->setup_hotplug = 1;
 	nfit_test->setup(nfit_test);