]> err.no Git - linux-2.6/commit
iwlwifi: Don't unlock priv->mutex if it isn't locked
authorRoland Dreier <rdreier@cisco.com>
Wed, 23 Apr 2008 23:22:13 +0000 (16:22 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Apr 2008 01:25:36 +0000 (21:25 -0400)
commit099714934d80100624829f1e2961b9dccaef3280
tree50c8b78f62c0f1f5e27643896330f7627a0f8163
parent4d381ffb02701c3fc976091473aead7c03523133
iwlwifi: Don't unlock priv->mutex if it isn't locked

Commit b716bb91 ("iwlwifi: Cancel scanning upon association") moved the
test of priv->vif in iwl{3945,4964}_mac_config_interface() outside of
where priv->mutex is held, but still tries to do mutex_unlock() on
return.  This is clearly wrong and triggers a nasty lockdep warning when
this codepath is triggered.  Fix this by removing the mutex_unlock().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c