1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 95b4a2a26707..5b624bfc01a6 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1253,6 +1253,9 @@ static int update_channel_integration_and_calibration(struct zd_chip *chip,
 {
         int r;
 
+        if (!zd_rf_should_update_pwr_int(&chip->rf))
+                return 0;
+
         r = update_pwr_int(chip, channel);
         if (r)
                 return r;
@@ -1283,7 +1286,7 @@ static int patch_cck_gain(struct zd_chip *chip)
         int r;
         u32 value;
 
-        if (!chip->patch_cck_gain)
+        if (!chip->patch_cck_gain || !zd_rf_should_patch_cck_gain(&chip->rf))
                 return 0;
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));