summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-10-19 20:50:23 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2010-10-19 20:50:23 +0800
commitf4e523f2ad179f6bf5691ddc3cd2893856fafc66 (patch)
tree25fc398303effaca04e9045a9ffb6f9171b6b45d /drivers/crypto
parenta752447af5b61f19e9c50322d9b07cea9a086084 (diff)
crypto: hifn_795x - use cancel_delayed_work_sync()
Make hifn_795x::hifn_remove() call cancel_delayed_work_sync() instead of calling cancel_delayed_work() followed by flush_scheduled_work(). This is to prepare for the deprecation and removal of flush_scheduled_work(). Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/hifn_795x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index e449ac5627a5..0eac3da566ba 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/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);