summaryrefslogtreecommitdiff
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorMaxime Bizon <mbizon@freebox.fr>2012-07-13 07:46:04 +0000
committerJohn Crispin <blogic@openwrt.org>2012-08-24 20:09:00 +0200
commit6d591805917cbc691e34cb3f8a10fef5997889bf (patch)
tree86721378a2d056fd0b655a7ff1b88f192a0e83c8 /arch/mips/bcm63xx
parent64eaea4a84a14f0299b5c0bc400fa92c10512d07 (diff)
downloadlinux-next-6d591805917cbc691e34cb3f8a10fef5997889bf.tar.gz
MIPS: BCM63XX: don't write to the chipid register on reboot
While harmless, it is bad style to do so. Signed-off-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Patchwork: http://patchwork.linux-mips.org/patch/4092/ Signed-off-by: John Crispin <blogic@openwrt.org>
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/setup.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c
index bd83836fa15e..314231be788c 100644
--- a/arch/mips/bcm63xx/setup.c
+++ b/arch/mips/bcm63xx/setup.c
@@ -86,6 +86,9 @@ void bcm63xx_machine_reboot(void)
}
for (i = 0; i < 2; i++) {
+ if (!perf_regs[i])
+ break;
+
reg = bcm_perf_readl(perf_regs[i]);
if (BCMCPU_IS_6348()) {
reg &= ~EXTIRQ_CFG_MASK_ALL_6348;