Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247187
b: refs/heads/master
c: a6ef814
h: refs/heads/master
i:
  247185: 81ffe19
  247183: 949dc06
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Apr 26, 2011
1 parent 24ac45b commit 3d09bb3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25f63a5a37f9cd925a01840bbb4c3ad9d5034175
refs/heads/master: a6ef8143839a8640532ba473906beb1a38b03e29
8 changes: 4 additions & 4 deletions trunk/drivers/ssb/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 3d09bb3

Please sign in to comment.