summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Goby <benoit@android.com>2014-01-10 03:40:04 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-10 03:40:04 +0000
commite3cd2168886b581b091f0912795ee8077fc94e53 (patch)
tree975d51553e6b75911c33aca548bf99868a43edd4
parentec7894cf5c08737f5dccacf462dd47c324309c64 (diff)
parent709543a96836be5f1c10e4051ec6207dec72cd08 (diff)
downloadsystem_core-e3cd2168886b581b091f0912795ee8077fc94e53.zip
system_core-e3cd2168886b581b091f0912795ee8077fc94e53.tar.gz
system_core-e3cd2168886b581b091f0912795ee8077fc94e53.tar.bz2
am 709543a9: am 08a140e6: Merge "toolbox: Fix date tool with /dev/alarm"
* commit '709543a96836be5f1c10e4051ec6207dec72cd08': toolbox: Fix date tool with /dev/alarm
-rw-r--r--toolbox/date.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toolbox/date.c b/toolbox/date.c
index ed307c0..d6c9052 100644
--- a/toolbox/date.c
+++ b/toolbox/date.c
@@ -16,7 +16,7 @@ static int settime_alarm(struct timespec *ts) {
if (fd < 0)
return fd;
- ret = ioctl(fd, ANDROID_ALARM_SET_RTC, &ts);
+ ret = ioctl(fd, ANDROID_ALARM_SET_RTC, ts);
close(fd);
return ret;
}