From: Johannes Berg Date: Wed, 5 Jan 2011 00:22:03 +0000 (-0800) Subject: iwlwifi: fix 4965 notification wait setup X-Git-Tag: MMI-PSA29.97-13-9~20520^2~448^2~32 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ea67485ae6894e603984c3b13b8df54ae2c128d8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git iwlwifi: fix 4965 notification wait setup The notification wait support code is shared between 4965 and other AGN devices, so 4965 also has to initialize the data structures for it, otherwise it crashes. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 3f1e5f1bf847..d9a7d93def6c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -2316,6 +2316,11 @@ static void iwl4965_rx_handler_setup(struct iwl_priv *priv) priv->rx_handlers[REPLY_RX] = iwlagn_rx_reply_rx; /* Tx response */ priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx; + + /* set up notification wait support */ + spin_lock_init(&priv->_agn.notif_wait_lock); + INIT_LIST_HEAD(&priv->_agn.notif_waits); + init_waitqueue_head(&priv->_agn.notif_waitq); } static void iwl4965_setup_deferred_work(struct iwl_priv *priv)