aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorelektroschmock <elektroschmock78@googlemail.com>2012-11-17 23:52:57 +0100
committerelektroschmock <elektroschmock78@googlemail.com>2012-11-17 23:52:57 +0100
commit2a11ce9a6629123b24ae6e0d9ae77fd56eb4e759 (patch)
treed6ffc9a0df261b13d5b8a2b9aded9c5275dd5d76
parentda177410c083645a5fc884e5cd8040a519b06c4e (diff)
downloadkernel_samsung_crespo-2a11ce9a6629123b24ae6e0d9ae77fd56eb4e759.zip
kernel_samsung_crespo-2a11ce9a6629123b24ae6e0d9ae77fd56eb4e759.tar.gz
kernel_samsung_crespo-2a11ce9a6629123b24ae6e0d9ae77fd56eb4e759.tar.bz2
timekeeping: fix a merge error
Change-Id: I4edf332cb30c07f2828af5375b6957e7b23c9cae
-rw-r--r--kernel/time/timekeeping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index 343ab2a..5928f95 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -649,7 +649,7 @@ static void update_sleep_time(struct timespec t)
*/
static void __timekeeping_inject_sleeptime(struct timespec *delta)
{
- if (!timespec_valid(delta)) {
+ if (!timespec_valid_strict(delta)) {
printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid "
"sleep delta value!\n");
return;