From: Roland Dreier <rdreier@cisco.com>
Date: Wed, 23 Apr 2008 23:22:13 +0000 (-0700)
Subject: iwlwifi: Don't unlock priv->mutex if it isn't locked
X-Git-Tag: v2.6.26-rc1~1088^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=099714934d80100624829f1e2961b9dccaef3280;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed