1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/net/wireless/zd1211rw/zd_rf.c b/drivers/net/wireless/zd1211rw/zd_rf.c
index 549c23bcd6cc..7407409b60b1 100644
--- a/drivers/net/wireless/zd1211rw/zd_rf.c
+++ b/drivers/net/wireless/zd1211rw/zd_rf.c
@@ -52,34 +52,38 @@ const char *zd_rf_name(u8 type)
 void zd_rf_init(struct zd_rf *rf)
 {
         memset(rf, 0, sizeof(*rf));
+
+        /* default to update channel integration, as almost all RF's do want
+         * this */
+        rf->update_channel_int = 1;
 }
 
 void zd_rf_clear(struct zd_rf *rf)
 {
+        if (rf->clear)
+                rf->clear(rf);
         ZD_MEMCLEAR(rf, sizeof(*rf));
 }
 
 int zd_rf_init_hw(struct zd_rf *rf, u8 type)
 {
-        int r, t;
+        int r = 0;
+        int t;
         struct zd_chip *chip = zd_rf_to_chip(rf);
 
         ZD_ASSERT(mutex_is_locked(&chip->mutex));
         switch (type) {
         case RF2959_RF:
                 r = zd_rf_init_rf2959(rf);
-                if (r)
-                        return r;
                 break;
         case AL2230_RF:
                 r = zd_rf_init_al2230(rf);
-                if (r)
-                        return r;
                 break;
         case AL7230B_RF:
                 r = zd_rf_init_al7230b(rf);
-                if (r)
-                        return r;
+                break;
+        case UW2453_RF:
+                r = zd_rf_init_uw2453(rf);
                 break;
         default:
                 dev_err(zd_chip_dev(chip),
@@ -88,6 +92,9 @@ int zd_rf_init_hw(struct zd_rf *rf, u8 type)
                 return -ENODEV;
         }
 
+        if (r)
+                return r;
+
         rf->type = type;
 
         r = zd_chip_lock_phy_regs(chip);