wl1251: Fix TSF calculation

[pandora-wifi.git] / drivers / net / wireless / wl12xx / wl1251_acx.c

diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.c b/drivers/net/wireless/wl12xx/wl1251_acx.c
index 3c04c95..d22e6a4 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1251_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_acx.c
@@ -847,7 +847,7 @@ int wl1251_acx_tsf_info(struct wl1251 *wl, u64 *mactime)
        }
 
        *mactime = tsf_info->current_tsf_lsb |
-               (tsf_info->current_tsf_msb << 31);
+               ((unsigned long long) tsf_info->current_tsf_msb << 32);
 
 out:
        kfree(tsf_info);