From 169f20bd42320a18d14c133992dad34ebaa15860 Mon Sep 17 00:00:00 2001 From: Sjur Braendeland Date: Tue, 10 Aug 2010 07:36:47 +0000 Subject: [PATCH] --- yaml --- r: 209219 b: refs/heads/master c: 98a21ef0abb666eeb12cf67e60203befb07e4210 h: refs/heads/master i: 209217: a7cd80507e235092bad11b6163d8775b646e2af6 209215: 7a918aeb8bac96362843a6f6a9573c10468e9ed2 v: v3 --- [refs] | 2 +- trunk/drivers/net/caif/caif_spi_slave.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 76afd1301998..0884548dd948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24e263adba5fea744a3965ab1ca44620b74cb9c8 +refs/heads/master: 98a21ef0abb666eeb12cf67e60203befb07e4210 diff --git a/trunk/drivers/net/caif/caif_spi_slave.c b/trunk/drivers/net/caif/caif_spi_slave.c index 077ccf840edf..2111dbfea6fe 100644 --- a/trunk/drivers/net/caif/caif_spi_slave.c +++ b/trunk/drivers/net/caif/caif_spi_slave.c @@ -22,13 +22,13 @@ #include #ifndef CONFIG_CAIF_SPI_SYNC -#define SPI_DATA_POS SPI_CMD_SZ +#define SPI_DATA_POS 0 static inline int forward_to_spi_cmd(struct cfspi *cfspi) { return cfspi->rx_cpck_len; } #else -#define SPI_DATA_POS 0 +#define SPI_DATA_POS SPI_CMD_SZ static inline int forward_to_spi_cmd(struct cfspi *cfspi) { return 0;