diff --git a/drivers/net/wireless/marvell/libertas/firmware.c b/drivers/net/wireless/marvell/libertas/firmware.c
index f124110944b7..6d0827058d40 100644
--- a/drivers/net/wireless/marvell/libertas/firmware.c
+++ b/drivers/net/wireless/marvell/libertas/firmware.c
@@ -113,7 +113,7 @@ static void load_next_firmware_from_table(struct lbs_private *priv)
 
 void lbs_wait_for_firmware_load(struct lbs_private *priv)
 {
-	wait_event(priv->fw_waitq, priv->fw_callback == NULL);
+	wait_event_lock_irq(priv->fw_waitq, priv->fw_callback == NULL, &priv->lock);
 }
 
 /**