projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
drivers
/
net
/
wireless
/
ti
/
wl1251
/
acx.c
diff --git
a/drivers/net/wireless/ti/wl1251/acx.c
b/drivers/net/wireless/ti/wl1251/acx.c
index ad87a1ac6462aab40befe12db72eef99fcc52f5b..db6430c1a08414650a894d3e8a6d41c57cba1711 100644
(file)
--- a/
drivers/net/wireless/ti/wl1251/acx.c
+++ b/
drivers/net/wireless/ti/wl1251/acx.c
@@
-869,7
+869,7
@@
int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime)
}
*mactime = tsf_info->current_tsf_lsb |
- (
tsf_info->current_tsf_msb << 31
);
+ (
(u64)tsf_info->current_tsf_msb << 32
);
out:
kfree(tsf_info);
This page took
0.032449 seconds
and
5
git commands to generate.