From 3b19a08920c26c91398b368b0f89f249e1bc58f4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 17 Oct 2007 15:36:53 +0100 Subject: [PATCH] --- yaml --- r: 70918 b: refs/heads/master c: c30db2480e8e6db08e64eb7e6778fb00bb01266f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/au1000/common/power.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 295b211d2fae..c9fdbe3a2fd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3e8d1da389fe2e514e31f6e93c690c8e1243849 +refs/heads/master: c30db2480e8e6db08e64eb7e6778fb00bb01266f diff --git a/trunk/arch/mips/au1000/common/power.c b/trunk/arch/mips/au1000/common/power.c index 6f57f72a7d57..54047d69b820 100644 --- a/trunk/arch/mips/au1000/common/power.c +++ b/trunk/arch/mips/au1000/common/power.c @@ -403,9 +403,9 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file, } - /* We don't want _any_ interrupts other than - * match20. Otherwise our au1000_calibrate_delay() - * calculation will be off, potentially a lot. + /* + * We don't want _any_ interrupts other than match20. Otherwise our + * au1000_calibrate_delay() calculation will be off, potentially a lot. */ intc0_mask = save_local_and_disable(0); intc1_mask = save_local_and_disable(1); @@ -414,6 +414,7 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file, au1000_calibrate_delay(); restore_local_and_enable(0, intc0_mask); restore_local_and_enable(1, intc1_mask); + return retval; }