diff --git a/[refs] b/[refs]
index 2b50a3c73fd4..56e3df936554 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c9d19646249e0124f1d82fb939e5ba76cb1af3c
+refs/heads/master: bba42776f5bade198d3bf918689da02acb63dadb
diff --git a/trunk/drivers/staging/iio/accel/sca3000_core.c b/trunk/drivers/staging/iio/accel/sca3000_core.c
index 12ee6f8d375a..12f1e4bc769c 100644
--- a/trunk/drivers/staging/iio/accel/sca3000_core.c
+++ b/trunk/drivers/staging/iio/accel/sca3000_core.c
@@ -382,7 +382,7 @@ sca3000_store_measurement_mode(struct device *dev,
 	struct iio_dev *indio_dev = dev_get_drvdata(dev);
 	struct sca3000_state *st = iio_priv(indio_dev);
 	int ret;
-	int mask = 0x03;
+	u8 mask = 0x03;
 	u8 val;
 
 	mutex_lock(&st->lock);