summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2011-04-23 21:30:28 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-26 23:50:29 +0400
commita6ef8143839a8640532ba473906beb1a38b03e29 (patch)
treec1654f720d5380316d995da77e265dc5b5634668
parent25f63a5a37f9cd925a01840bbb4c3ad9d5034175 (diff)
downloadlinux-a6ef8143839a8640532ba473906beb1a38b03e29.tar.xz
ssb: mark bus as powered up earlier
ssb_chipco_set_clockmode may want to touch CC registers to control power of the bus. However touching registers without powered_up set causes warnings. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/ssb/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index e05ba6eefc7e..74aa2cca7d8c 100644
--- a/drivers/ssb/main.c
+++ b/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");