Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / net / wireless / iwlwifi / iwl-agn-lib.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 8163a0efdc83b96bb113d67e1307cdd97ac38a41..3a02bea4632831e7b15d9e57867d847420ec3aef 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2264,7 +2264,7 @@ signed long iwlagn_wait_notification(struct iwl_priv *priv,
        int ret;
 
        ret = wait_event_timeout(priv->_agn.notif_waitq,
-                                &wait_entry->triggered,
+                                wait_entry->triggered,
                                 timeout);
 
        spin_lock_bh(&priv->_agn.notif_wait_lock);