diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 40c36d5d73775f348c53bc7f350d0ae92cf813db..09a80b55cf5a1ffaf06fdbe892ac469f6790b2bf 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -862,7 +862,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
 		rcu_assign_pointer(local->p2p_sdata, NULL);
 		/* fall through */
 	default:
-		flush_work(&sdata->work);
+		cancel_work_sync(&sdata->work);
 		/*
 		 * When we get here, the interface is marked down.
 		 * Call rcu_barrier() to wait both for the RX path