diff options
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/au1000/common/power.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c index 54047d69b820..a9f7f6371e4b 100644 --- a/arch/mips/au1000/common/power.c +++ b/arch/mips/au1000/common/power.c | |||
@@ -258,7 +258,6 @@ int au_sleep(void) | |||
258 | static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, | 258 | static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, |
259 | void __user *buffer, size_t * len, loff_t *ppos) | 259 | void __user *buffer, size_t * len, loff_t *ppos) |
260 | { | 260 | { |
261 | int retval = 0; | ||
262 | #ifdef SLEEP_TEST_TIMEOUT | 261 | #ifdef SLEEP_TEST_TIMEOUT |
263 | #define TMPBUFLEN2 16 | 262 | #define TMPBUFLEN2 16 |
264 | char buf[TMPBUFLEN2], *p; | 263 | char buf[TMPBUFLEN2], *p; |
@@ -278,33 +277,21 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file, | |||
278 | p = buf; | 277 | p = buf; |
279 | sleep_ticks = simple_strtoul(p, &p, 0); | 278 | sleep_ticks = simple_strtoul(p, &p, 0); |
280 | #endif | 279 | #endif |
281 | retval = pm_send_all(PM_SUSPEND, (void *) 2); | ||
282 | |||
283 | if (retval) | ||
284 | return retval; | ||
285 | 280 | ||
286 | au_sleep(); | 281 | au_sleep(); |
287 | retval = pm_send_all(PM_RESUME, (void *) 0); | ||
288 | } | 282 | } |
289 | return retval; | 283 | return 0; |
290 | } | 284 | } |
291 | 285 | ||
292 | static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, | 286 | static int pm_do_suspend(ctl_table * ctl, int write, struct file *file, |
293 | void __user *buffer, size_t * len, loff_t *ppos) | 287 | void __user *buffer, size_t * len, loff_t *ppos) |
294 | { | 288 | { |
295 | int retval = 0; | ||
296 | |||
297 | if (!write) { | 289 | if (!write) { |
298 | *len = 0; | 290 | *len = 0; |
299 | } else { | 291 | } else { |
300 | retval = pm_send_all(PM_SUSPEND, (void *) 2); | ||
301 | if (retval) | ||
302 | return retval; | ||
303 | suspend_mode = 1; | 292 | suspend_mode = 1; |
304 | |||
305 | retval = pm_send_all(PM_RESUME, (void *) 0); | ||
306 | } | 293 | } |
307 | return retval; | 294 | return 0; |
308 | } | 295 | } |
309 | 296 | ||
310 | 297 | ||