genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-09-17 20:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

spi: prevent mxc_spi nuking when buffers don't exist

Browse Source
This commit is contained in:
Matt Sealey
2010-12-03 05:38:37 -06:00
parent 9433ed8cc5
commit f034b79aae
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/spi/mxc_spi.c
View File

@@ -431,30 +431,34 @@ static struct mxc_spi_unique_def spi_ver_0_0 = {
extern void gpio_spi_active(int cspi_mod);
extern void gpio_spi_inactive(int cspi_mod);
#define MXC_SPI_BUF_RX(type) \
void mxc_spi_buf_rx_##type(struct mxc_spi *master_drv_data, u32 val)\
{\
type *rx = master_drv_data->transfer.rx_buf;\
*rx++ = (type)val;\
master_drv_data->transfer.rx_buf = rx;\
#define MXC_SPI_BUF_RX(type) \
void mxc_spi_buf_rx_##type(struct mxc_spi *master_drv_data, u32 val) \
{ \
type *rx = master_drv_data->transfer.rx_buf; \
if (rx) { \
*rx++ = (type)val; \
master_drv_data->transfer.rx_buf = rx; \
} \
}
#define MXC_SPI_BUF_TX(type) \
u32 mxc_spi_buf_tx_##type(struct mxc_spi *master_drv_data)\
{\
u32 val;\
const type *tx = master_drv_data->transfer.tx_buf;\
val = *tx++;\
master_drv_data->transfer.tx_buf = tx;\
return val;\
#define MXC_SPI_BUF_TX(type) \
u32 mxc_spi_buf_tx_##type(struct mxc_spi *master_drv_data) \
{ \
u32 val = 0; \
const type *tx = master_drv_data->transfer.tx_buf; \
if (tx) { \
val = *tx++; \
master_drv_data->transfer.tx_buf = tx; \
} \
return val; \
}
MXC_SPI_BUF_RX(u8)
MXC_SPI_BUF_TX(u8)
MXC_SPI_BUF_RX(u16)
MXC_SPI_BUF_TX(u16)
MXC_SPI_BUF_RX(u32)
MXC_SPI_BUF_TX(u32)
MXC_SPI_BUF_TX(u8)
MXC_SPI_BUF_RX(u16)
MXC_SPI_BUF_TX(u16)
MXC_SPI_BUF_RX(u32)
MXC_SPI_BUF_TX(u32)
/*!
* This function enables CSPI interrupt(s)