Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / ath / ath5k / reset.c

diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index e2d8b2cf19eb52df95226ca8fb9661a427d92f95..a3399c4f13a9a85c070bebf1ecbcd7cc6eed24e6 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -984,9 +984,7 @@ ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
        if (ah->ah_version == AR5K_AR5210)
                return;
 
-       ee_mode = ath5k_eeprom_mode_from_channel(channel);
-       if (WARN_ON(ee_mode < 0))
-               return;
+       ee_mode = ath5k_eeprom_mode_from_channel(ah, channel);
 
        /* Adjust power delta for channel 14 */
        if (channel->center_freq == 2484)