---

yaml --- r: 311402 b: refs/heads/master c: cae6247 h: refs/heads/master v: v3
git-mirror · Jun 20, 2012 · 0ef78c7 · 0ef78c7
1 parent ac4f987
commit 0ef78c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69d4cfef8befc6ed89e5e3280f3170eb3153d57a
+refs/heads/master: cae6247db0b93673d170bc0e02aff85f53bc422c
diff --git a/trunk/drivers/net/wireless/ti/wl1251/acx.c b/trunk/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);