---

yaml --- r: 361220 b: refs/heads/master c: aa1e123 h: refs/heads/master v: v3
git-mirror · Mar 11, 2013 · 9bcc15d · 9bcc15d
1 parent 249b99e
commit 9bcc15d
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: b5ae11463a67a5e468dd67482ab2308994da9b2b
+refs/heads/master: aa1e1234826e21197f818ca0abf519775ad4eb5c
diff --git a/trunk/drivers/staging/vt6656/card.c b/trunk/drivers/staging/vt6656/card.c
@@ -790,7 +790,7 @@ u64 CARDqGetNextTBTT(u64 qwTSF, WORD wBeaconInterval)
 	if ((~uLowNextTBTT) < uLowRemain)
 		qwTSF = ((qwTSF >> 32) + 1) << 32;
 
-	qwTSF = (qwTSF & 0xffffffff00000000UL) |
+	qwTSF = (qwTSF & 0xffffffff00000000ULL) |
 		(u64)(uLowNextTBTT + uLowRemain);
 
     return (qwTSF);