From 3d09bb39486ad26891788356b53b4b0f1df1922b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sat, 23 Apr 2011 19:30:28 +0200
Subject: [PATCH] --- yaml --- r: 247187 b: refs/heads/master c:
 a6ef8143839a8640532ba473906beb1a38b03e29 h: refs/heads/master i:   247185:
 81ffe192cdb98ca5f9f4d665b1d3e4a4c1ba3eba   247183:
 949dc060f20345bd666d53c7f7d99989692d3cbe v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/ssb/main.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8ee52b979373..a5d4f3e9740f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25f63a5a37f9cd925a01840bbb4c3ad9d5034175
+refs/heads/master: a6ef8143839a8640532ba473906beb1a38b03e29
diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c
index e05ba6eefc7e..74aa2cca7d8c 100644
--- a/trunk/drivers/ssb/main.c
+++ b/trunk/drivers/ssb/main.c
@@ -1309,20 +1309,20 @@ EXPORT_SYMBOL(ssb_bus_may_powerdown);
 
 int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl)
 {
-	struct ssb_chipcommon *cc;
 	int err;
 	enum ssb_clkmode mode;
 
 	err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 1);
 	if (err)
 		goto error;
-	cc = &bus->chipco;
-	mode = dynamic_pctl ? SSB_CLKMODE_DYNAMIC : SSB_CLKMODE_FAST;
-	ssb_chipco_set_clockmode(cc, mode);
 
 #ifdef CONFIG_SSB_DEBUG
 	bus->powered_up = 1;
 #endif
+
+	mode = dynamic_pctl ? SSB_CLKMODE_DYNAMIC : SSB_CLKMODE_FAST;
+	ssb_chipco_set_clockmode(&bus->chipco, mode);
+
 	return 0;
 error:
 	ssb_printk(KERN_ERR PFX "Bus powerup failed\n");