diff --git a/[refs] b/[refs]
index ef50de4b64e7..c59b6e1638f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f6a0bad61e34c648fd08ff8dcbfdd58148963d2
+refs/heads/master: 06220b89f2284f910f925676d757fd3331138dc6
diff --git a/trunk/drivers/staging/iio/imu/adis16400_core.c b/trunk/drivers/staging/iio/imu/adis16400_core.c
index 9c8f5ab7e13b..cb6622578e9b 100644
--- a/trunk/drivers/staging/iio/imu/adis16400_core.c
+++ b/trunk/drivers/staging/iio/imu/adis16400_core.c
@@ -178,7 +178,11 @@ static int adis16334_set_freq(struct iio_dev *indio_dev, unsigned int freq)
 {
 	unsigned int t;
 
-	t = ilog2(8192 / (freq * 10));
+	freq *= 10;
+	if (freq < 8192)
+		t = ilog2(8192 / freq);
+	else
+		t = 0;
 
 	if (t > 0x31)
 		t = 0x31;