From dd9f7b32043bf5c2c156a168274a7f663e824bb4 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 17 Jul 2007 04:04:04 -0700
Subject: [PATCH] --- yaml --- r: 60785 b: refs/heads/master c:
 4917d927809918f0070bd1077b41e3daf78643b2 h: refs/heads/master i:   60783:
 221bdc7aba07642f9e7d83dee309eb4da3012781 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/spi/spidev.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 11747150a5bf..938657073232 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad241528c4919505afccb022acbab3eeb0db4d80
+refs/heads/master: 4917d927809918f0070bd1077b41e3daf78643b2
diff --git a/trunk/drivers/spi/spidev.c b/trunk/drivers/spi/spidev.c
index d04242aee40d..38b60ad0eda0 100644
--- a/trunk/drivers/spi/spidev.c
+++ b/trunk/drivers/spi/spidev.c
@@ -181,7 +181,8 @@ static int spidev_message(struct spidev_data *spidev,
 		}
 		if (u_tmp->tx_buf) {
 			k_tmp->tx_buf = buf;
-			if (copy_from_user(buf, (const u8 __user *)u_tmp->tx_buf,
+			if (copy_from_user(buf, (const u8 __user *)
+						(ptrdiff_t) u_tmp->tx_buf,
 					u_tmp->len))
 				goto done;
 		}
@@ -213,7 +214,8 @@ static int spidev_message(struct spidev_data *spidev,
 	buf = spidev->buffer;
 	for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
 		if (u_tmp->rx_buf) {
-			if (__copy_to_user((u8 __user *)u_tmp->rx_buf, buf,
+			if (__copy_to_user((u8 __user *)
+					(ptrdiff_t) u_tmp->rx_buf, buf,
 					u_tmp->len)) {
 				status = -EFAULT;
 				goto done;