From aac282c5071f31b2a9d9e12a13a5355250344333 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 19 Oct 2010 20:50:23 +0800
Subject: [PATCH] --- yaml --- r: 215541 b: refs/heads/master c:
 f4e523f2ad179f6bf5691ddc3cd2893856fafc66 h: refs/heads/master i:   215539:
 955e69a11100989072ea35dea3f185ef400acb51 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/crypto/hifn_795x.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e2dbd8bcfd7a..694844c315d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a752447af5b61f19e9c50322d9b07cea9a086084
+refs/heads/master: f4e523f2ad179f6bf5691ddc3cd2893856fafc66
diff --git a/trunk/drivers/crypto/hifn_795x.c b/trunk/drivers/crypto/hifn_795x.c
index e449ac5627a5..0eac3da566ba 100644
--- a/trunk/drivers/crypto/hifn_795x.c
+++ b/trunk/drivers/crypto/hifn_795x.c
@@ -2700,8 +2700,7 @@ static void __devexit hifn_remove(struct pci_dev *pdev)
 	dev = pci_get_drvdata(pdev);
 
 	if (dev) {
-		cancel_delayed_work(&dev->work);
-		flush_scheduled_work();
+		cancel_delayed_work_sync(&dev->work);
 
 		hifn_unregister_rng(dev);
 		hifn_unregister_alg(dev);