diff --git a/[refs] b/[refs]
index e8ee079e0bc8..38083c2ee42c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a2a4da43995864786d59f5f0ebf42c0c1e2cdd1
+refs/heads/master: 96ddbf504a05502800e7cbeb4d08abbcc206c51c
diff --git a/trunk/drivers/spi/spidev.c b/trunk/drivers/spi/spidev.c
index 630f781aeb19..c55459c592b8 100644
--- a/trunk/drivers/spi/spidev.c
+++ b/trunk/drivers/spi/spidev.c
@@ -183,7 +183,9 @@ static int spidev_message(struct spidev_data *spidev,
 
 		if (u_tmp->rx_buf) {
 			k_tmp->rx_buf = buf;
-			if (!access_ok(VERIFY_WRITE, u_tmp->rx_buf, u_tmp->len))
+			if (!access_ok(VERIFY_WRITE, (u8 __user *)
+						(ptrdiff_t) u_tmp->rx_buf,
+						u_tmp->len))
 				goto done;
 		}
 		if (u_tmp->tx_buf) {