carl9170 firmware: fix clock_set parameter mixup

[carl9170fw.git] / carlfw / src / rf.c

diff --git a/carlfw/src/rf.c b/carlfw/src/rf.c
index bb74b817aed2ee7428753b03e138b4ab2dc4a9e2..ae9fd5464e4fcb6f59150c1f34e22dda95e30b4d 100644 (file)
--- a/carlfw/src/rf.c
+++ b/carlfw/src/rf.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000-2005 ZyDAS Technology Corporation
  * Copyright (c) 2007-2009 Atheros Communications, Inc.
  * Copyright   2009    Johannes Berg <johannes@sipsolutions.net>
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -215,7 +215,6 @@ void rf_cmd(const struct carl9170_cmd *cmd, struct carl9170_rsp *resp)
        resp->rf_init_res.ret = cpu_to_le32(ret);
 }
 
-#ifdef CONFIG_CARL9170FW_PSM
 void rf_psm(void)
 {
        u32 bank3;
@@ -244,7 +243,7 @@ void rf_psm(void)
                /* Synthesizer off + RX off */
                bank3 = 0x00400018;
 
-               clock_set(true, AHB_20_22MHZ);
+               clock_set(AHB_20_22MHZ, false);
        } else {
                /* advance to the next PSM step */
                fw.phy.psm.state--;
@@ -262,9 +261,9 @@ void rf_psm(void)
                        bank3 = 0x01420098;
 
                        if ((fw.phy.ht_settings & EIGHTY_FLAG) == EIGHTY_FLAG)
-                               clock_set(true, AHB_80_88MHZ);
+                               clock_set(AHB_80_88MHZ, true);
                        else
-                               clock_set(true, AHB_40_44MHZ);
+                               clock_set(AHB_40_44MHZ, true);
                } else {
                        return ;
                }
@@ -275,6 +274,5 @@ void rf_psm(void)
 
        set(0x1c58f0, bank3);
 }
-#endif /* CONFIG_CARL9170FW_PSM */
 
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */