diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-06 19:52:51 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-06-09 10:38:06 -0400 |
commit | 36f6ea2b21cce09f4f85a8fca007aa6a927804f7 (patch) | |
tree | aed1261db4df68165c459d91dcd72a062dcca213 /drivers/ssb | |
parent | d7b631419b3d230a4d383a8c5f5f294f3bc564f9 (diff) |
SSB: Fix handling of ssb_pmu_get_alp_clock()
Dan Carpenter reported missing brackets which resulted in reading a
wrong crystalfreq value. I also noticed that the result of this
function is ignored.
Reported-By: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Michael Buesch <m@bues.ch>
Cc: davem@davemloft.net
Cc: netdev@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10536/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/ssb')
-rw-r--r-- | drivers/ssb/driver_chipcommon_pmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ssb/driver_chipcommon_pmu.c b/drivers/ssb/driver_chipcommon_pmu.c index 09428412139e..c5352ea4821e 100644 --- a/drivers/ssb/driver_chipcommon_pmu.c +++ b/drivers/ssb/driver_chipcommon_pmu.c | |||
@@ -621,8 +621,8 @@ static u32 ssb_pmu_get_alp_clock_clk0(struct ssb_chipcommon *cc) | |||
621 | u32 crystalfreq; | 621 | u32 crystalfreq; |
622 | const struct pmu0_plltab_entry *e = NULL; | 622 | const struct pmu0_plltab_entry *e = NULL; |
623 | 623 | ||
624 | crystalfreq = chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & | 624 | crystalfreq = (chipco_read32(cc, SSB_CHIPCO_PMU_CTL) & |
625 | SSB_CHIPCO_PMU_CTL_XTALFREQ >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; | 625 | SSB_CHIPCO_PMU_CTL_XTALFREQ) >> SSB_CHIPCO_PMU_CTL_XTALFREQ_SHIFT; |
626 | e = pmu0_plltab_find_entry(crystalfreq); | 626 | e = pmu0_plltab_find_entry(crystalfreq); |
627 | BUG_ON(!e); | 627 | BUG_ON(!e); |
628 | return e->freq * 1000; | 628 | return e->freq * 1000; |
@@ -634,7 +634,7 @@ u32 ssb_pmu_get_alp_clock(struct ssb_chipcommon *cc) | |||
634 | 634 | ||
635 | switch (bus->chip_id) { | 635 | switch (bus->chip_id) { |
636 | case 0x5354: | 636 | case 0x5354: |
637 | ssb_pmu_get_alp_clock_clk0(cc); | 637 | return ssb_pmu_get_alp_clock_clk0(cc); |
638 | default: | 638 | default: |
639 | ssb_err("ERROR: PMU alp clock unknown for device %04X\n", | 639 | ssb_err("ERROR: PMU alp clock unknown for device %04X\n", |
640 | bus->chip_id); | 640 | bus->chip_id); |