diff options
Diffstat (limited to 'arch/arm/plat-samsung/pm.c')
-rw-r--r-- | arch/arm/plat-samsung/pm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index 15070284343e..002b1472293b 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c | |||
@@ -51,7 +51,7 @@ void s3c_pm_dbg(const char *fmt, ...) | |||
51 | char buff[256]; | 51 | char buff[256]; |
52 | 52 | ||
53 | va_start(va, fmt); | 53 | va_start(va, fmt); |
54 | vsprintf(buff, fmt, va); | 54 | vsnprintf(buff, sizeof(buff), fmt, va); |
55 | va_end(va); | 55 | va_end(va); |
56 | 56 | ||
57 | printascii(buff); | 57 | printascii(buff); |
@@ -243,6 +243,7 @@ int (*pm_cpu_sleep)(unsigned long); | |||
243 | 243 | ||
244 | static int s3c_pm_enter(suspend_state_t state) | 244 | static int s3c_pm_enter(suspend_state_t state) |
245 | { | 245 | { |
246 | int ret; | ||
246 | /* ensure the debug is initialised (if enabled) */ | 247 | /* ensure the debug is initialised (if enabled) */ |
247 | 248 | ||
248 | s3c_pm_debug_init(); | 249 | s3c_pm_debug_init(); |
@@ -300,7 +301,9 @@ static int s3c_pm_enter(suspend_state_t state) | |||
300 | * we resume as it saves its own register state and restores it | 301 | * we resume as it saves its own register state and restores it |
301 | * during the resume. */ | 302 | * during the resume. */ |
302 | 303 | ||
303 | cpu_suspend(0, pm_cpu_sleep); | 304 | ret = cpu_suspend(0, pm_cpu_sleep); |
305 | if (ret) | ||
306 | return ret; | ||
304 | 307 | ||
305 | /* restore the system state */ | 308 | /* restore the system state */ |
306 | 309 | ||