Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d161817 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

p54spi: Fix workqueue deadlock 



priv->work must not be synced while priv->mutex is locked, because
the mutex is taken in the work handler.
Move cancel_work_sync down to after the device shutdown code.
This is safe, because the work handler checks fw_state and bails out
early in case of a race.

Signed-off-by: default avatarMichael Buesch <m@bues.ch>
Cc: <stable@vger.kernel.org>
Acked-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 32d3a392

drivers/net/wireless/p54/p54spi.c

+2 −2
Original line number Diff line number Diff line
@@ -588,8 +588,6 @@ static void p54spi_op_stop(struct ieee80211_hw *dev) 


	WARN_ON(priv->fw_state != FW_STATE_READY);



	cancel_work_sync(&priv->work);



	p54spi_power_off(priv);

	spin_lock_irqsave(&priv->tx_lock, flags);

	INIT_LIST_HEAD(&priv->tx_pending);
@@ -597,6 +595,8 @@ static void p54spi_op_stop(struct ieee80211_hw *dev) 


	priv->fw_state = FW_STATE_OFF;

	mutex_unlock(&priv->mutex);



	cancel_work_sync(&priv->work);

}



static int __devinit p54spi_probe(struct spi_device *spi)