X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=drivers%2Fmtd%2Fubi%2Fbuild.c;fp=drivers%2Fmtd%2Fubi%2Fbuild.c;h=74425af840d646af7458d0e571704c58eb06a18c;hp=753494e042d51cdbfb22b93fc16c58fa43002ec0;hb=6e7d80161066c99d12580d1b985cb1408bb58cf1;hpb=e1db654d8e326173a1c1a0194185250340cab03c

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 753494e042d5..74425af840d6 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1091,6 +1091,9 @@ int ubi_detach_mtd_dev(int ubi_num, int anyway)
 	if (ubi->bgt_thread)
 		kthread_stop(ubi->bgt_thread);
 
+#ifdef CONFIG_MTD_UBI_FASTMAP
+	cancel_work_sync(&ubi->fm_work);
+#endif
 	ubi_debugfs_exit_dev(ubi);
 	uif_close(ubi);