diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-02 01:12:54 -0500 |
| commit | 18ee3610040a4c008ce08a40a5dd025241cc7e97 (patch) | |
| tree | 32a996a5123726b63c31a1522f230933fb967a32 /kernel/time.c | |
| parent | e4e7b89280d1d666e2c09e5ad36cf071796c4c7e (diff) | |
| parent | b4103333d7904310d34de18d85e51e3d74f00a3b (diff) | |
Merge branch 'master'
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c index 7477b1d2079e..1f23e683d6aa 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
| @@ -155,7 +155,7 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz) | |||
| 155 | static int firsttime = 1; | 155 | static int firsttime = 1; |
| 156 | int error = 0; | 156 | int error = 0; |
| 157 | 157 | ||
| 158 | if (!timespec_valid(tv)) | 158 | if (tv && !timespec_valid(tv)) |
| 159 | return -EINVAL; | 159 | return -EINVAL; |
| 160 | 160 | ||
| 161 | error = security_settime(tv, tz); | 161 | error = security_settime(tv, tz); |