diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-06-29 10:13:44 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-06-29 10:13:44 +0100 |
| commit | 422e09039bbc2d488d10e9d7d02c531d0478e149 (patch) | |
| tree | 0ecb34dbdbcb4dd2fbe03f653d8d7947ebdfe638 /include/linux/timekeeping.h | |
| parent | ccc12561926c0bef9a40865db93b926a0927e93f (diff) | |
| parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
Merge branches 'ib-mfd-regmap-4.8' and 'ib-mfd-regulator-arm-4.8' into ibs-for-mfd-merged
Diffstat (limited to 'include/linux/timekeeping.h')
| -rw-r--r-- | include/linux/timekeeping.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 37dbacf84849..816b7543f81b 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -21,6 +21,9 @@ static inline int do_sys_settimeofday(const struct timespec *tv, struct timespec64 ts64; if (!tv) + return do_sys_settimeofday64(NULL, tz); + + if (!timespec_valid(tv)) return -EINVAL; ts64 = timespec_to_timespec64(*tv); |