diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
| commit | cc755896a4274f11283bca32d1d658203844057a (patch) | |
| tree | 218970ece71df99f686b9416b7fd88b921690ebb /drivers/net/wireless/iwlwifi/iwl-3945.c | |
| parent | d250fe91ae129bff0968e685cc9c466d3a5e3482 (diff) | |
| parent | 9459d59fbf0bc82ff4c804679fa8bc22788eca63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 17197a78d894..99b876a2feb9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
| @@ -2483,7 +2483,6 @@ int iwl3945_hw_set_hw_params(struct iwl_priv *priv) | |||
| 2483 | &priv->_3945.shared_phys, GFP_KERNEL); | 2483 | &priv->_3945.shared_phys, GFP_KERNEL); |
| 2484 | if (!priv->_3945.shared_virt) { | 2484 | if (!priv->_3945.shared_virt) { |
| 2485 | IWL_ERR(priv, "failed to allocate pci memory\n"); | 2485 | IWL_ERR(priv, "failed to allocate pci memory\n"); |
| 2486 | mutex_unlock(&priv->mutex); | ||
| 2487 | return -ENOMEM; | 2486 | return -ENOMEM; |
| 2488 | } | 2487 | } |
| 2489 | 2488 | ||