projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
atmel_spi: fix dmachain oops with DEBUG enabled
[powerpc.git]
/
drivers
/
spi
/
spidev.c
diff --git
a/drivers/spi/spidev.c
b/drivers/spi/spidev.c
index
c55459c
..
b3518ca
100644
(file)
--- a/
drivers/spi/spidev.c
+++ b/
drivers/spi/spidev.c
@@
-184,14
+184,14
@@
static int spidev_message(struct spidev_data *spidev,
if (u_tmp->rx_buf) {
k_tmp->rx_buf = buf;
if (!access_ok(VERIFY_WRITE, (u8 __user *)
if (u_tmp->rx_buf) {
k_tmp->rx_buf = buf;
if (!access_ok(VERIFY_WRITE, (u8 __user *)
- (
ptrdiff
_t) u_tmp->rx_buf,
+ (
uintptr
_t) u_tmp->rx_buf,
u_tmp->len))
goto done;
}
if (u_tmp->tx_buf) {
k_tmp->tx_buf = buf;
if (copy_from_user(buf, (const u8 __user *)
u_tmp->len))
goto done;
}
if (u_tmp->tx_buf) {
k_tmp->tx_buf = buf;
if (copy_from_user(buf, (const u8 __user *)
- (
ptrdiff
_t) u_tmp->tx_buf,
+ (
uintptr
_t) u_tmp->tx_buf,
u_tmp->len))
goto done;
}
u_tmp->len))
goto done;
}
@@
-224,7
+224,7
@@
static int spidev_message(struct spidev_data *spidev,
for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
if (u_tmp->rx_buf) {
if (__copy_to_user((u8 __user *)
for (n = n_xfers, u_tmp = u_xfers; n; n--, u_tmp++) {
if (u_tmp->rx_buf) {
if (__copy_to_user((u8 __user *)
- (
ptrdiff
_t) u_tmp->rx_buf, buf,
+ (
uintptr
_t) u_tmp->rx_buf, buf,
u_tmp->len)) {
status = -EFAULT;
goto done;
u_tmp->len)) {
status = -EFAULT;
goto done;