git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
spi
/
spi-s3c64xx.c
diff --git
a/drivers/spi/spi-s3c64xx.c
b/drivers/spi/spi-s3c64xx.c
index
1a81c90
..
6e7a805
100644
(file)
--- a/
drivers/spi/spi-s3c64xx.c
+++ b/
drivers/spi/spi-s3c64xx.c
@@
-132,7
+132,7
@@
struct s3c64xx_spi_dma_data {
unsigned ch;
struct s3c64xx_spi_dma_data {
unsigned ch;
- enum dma_
data
_direction direction;
+ enum dma_
transfer
_direction direction;
enum dma_ch dmach;
struct property *dma_prop;
};
enum dma_ch dmach;
struct property *dma_prop;
};
@@
-1067,11
+1067,11
@@
static int __devinit s3c64xx_spi_get_dmares(
if (tx) {
dma_data = &sdd->tx_dma;
if (tx) {
dma_data = &sdd->tx_dma;
- dma_data->direction = DMA_
TO_DEVICE
;
+ dma_data->direction = DMA_
MEM_TO_DEV
;
chan_str = "tx";
} else {
dma_data = &sdd->rx_dma;
chan_str = "tx";
} else {
dma_data = &sdd->rx_dma;
- dma_data->direction = DMA_
FROM_DEVICE
;
+ dma_data->direction = DMA_
DEV_TO_MEM
;
chan_str = "rx";
}
chan_str = "rx";
}