diff --git a/[refs] b/[refs]
index 14c5d3a7e1c6..36caebc2f47c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cec4a69cfc2bc780b4107193cb9bd621b67ab2b6
+refs/heads/master: 9bbf1ecdb36e2395eecbf04229eaaedce3589db5
diff --git a/trunk/drivers/staging/batman-adv/vis.c b/trunk/drivers/staging/batman-adv/vis.c
index 086da871cd59..054631012138 100644
--- a/trunk/drivers/staging/batman-adv/vis.c
+++ b/trunk/drivers/staging/batman-adv/vis.c
@@ -377,7 +377,7 @@ static void purge_vis_packets(void)
 		if (info == my_vis_info)	/* never purge own data. */
 			continue;
 		if (time_after(jiffies,
-			       info->first_seen + (VIS_TIMEOUT/1000)*HZ)) {
+			       info->first_seen + (VIS_TIMEOUT*HZ)/1000)) {
 			hash_remove_bucket(vis_hash, &hashit);
 			free_info(info);
 		}
@@ -556,6 +556,6 @@ void vis_quit(void)
 static void start_vis_timer(void)
 {
 	queue_delayed_work(bat_event_workqueue, &vis_timer_wq,
-			   (atomic_read(&vis_interval)/1000) * HZ);
+			   (atomic_read(&vis_interval) * HZ) / 1000);
 }