diff options
author | Colin Cross <ccross@android.com> | 2011-07-12 20:10:37 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2011-07-12 20:10:37 -0700 |
commit | 75c56a81116e51c5cf15c0641906d0745188cd16 (patch) | |
tree | c1d8e7def5bbb099a39d5e9ccfb13508ea5ca46a /drivers/spi | |
parent | b4294d618e8a19bb47826e51ae52b9fb2fe05f80 (diff) | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) |
Merge commit 'v3.0-rc7' into android-3.0
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi_s3c64xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi_s3c64xx.c b/drivers/spi/spi_s3c64xx.c index 795828b90f4..8945e201e42 100644 --- a/drivers/spi/spi_s3c64xx.c +++ b/drivers/spi/spi_s3c64xx.c @@ -116,9 +116,7 @@ (((i)->fifo_lvl_mask + 1))) \ ? 1 : 0) -#define S3C64XX_SPI_ST_TX_DONE(v, i) ((((v) >> (i)->rx_lvl_offset) & \ - (((i)->fifo_lvl_mask + 1) << 1)) \ - ? 1 : 0) +#define S3C64XX_SPI_ST_TX_DONE(v, i) (((v) & (1 << (i)->tx_st_done)) ? 1 : 0) #define TX_FIFO_LVL(v, i) (((v) >> 6) & (i)->fifo_lvl_mask) #define RX_FIFO_LVL(v, i) (((v) >> (i)->rx_lvl_offset) & (i)->fifo_lvl_mask) |