diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index 90c6cf676221af475319daf90b9d5887ce3365c3..60725e0b22542f3b6b8ebc0e22cad7b0bf08398c 100644
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -1949,6 +1949,8 @@ void ncsi_unregister_dev(struct ncsi_dev *nd)
 	list_del_rcu(&ndp->node);
 	spin_unlock_irqrestore(&ncsi_dev_lock, flags);
 
+	cancel_work_sync(&ndp->work);
+
 	kfree(ndp);
 }
 EXPORT_SYMBOL_GPL(ncsi_unregister_dev);