diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2007-11-06 13:40:39 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-11-06 13:40:39 -0800 |
| commit | 4b07ae9b9d7b05a63e3ece32a666041949b7f421 (patch) | |
| tree | 62e78c1d22dc58aa21bcd00309df3675f4332d04 | |
| parent | 8d0a6e4da5ecde2022025ee764e4f7e425a53770 (diff) | |
| download | blackbird-op-linux-4b07ae9b9d7b05a63e3ece32a666041949b7f421.tar.gz blackbird-op-linux-4b07ae9b9d7b05a63e3ece32a666041949b7f421.zip | |
[IA64] Wrong args to memset in efi_gettimeofday()
Not sizeof(ptr) ... we meant to say sizeof(*ptr).
Also moved the memset to the error path (the normal path overwrites
every field in the structure anyway) -Tony
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/kernel/efi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 6216eba2e38f..5181bf551f3c 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -218,9 +218,10 @@ efi_gettimeofday (struct timespec *ts) { efi_time_t tm; - memset(ts, 0, sizeof(ts)); - if ((*efi.get_time)(&tm, NULL) != EFI_SUCCESS) + if ((*efi.get_time)(&tm, NULL) != EFI_SUCCESS) { + memset(ts, 0, sizeof(*ts)); return; + } ts->tv_sec = mktime(tm.year, tm.month, tm.day, tm.hour, tm.minute, tm.second); ts->tv_nsec = tm.nanosecond; |
