diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 16:54:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-08 16:54:46 -0400 |
| commit | 365a13a582e6a80c639c54dc2a83b03b9ff0169a (patch) | |
| tree | d706678393969e2742e23cf88a6469e7124af74d /drivers/spi/omap2_mcspi.c | |
| parent | d21131bb0aa9e2ffbd256c62ee270f3c9a2a9a2c (diff) | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff) | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
spi/rtc-m41t93: Use spi_get_drvdata() for SPI devices
spi/omap2: fix uninitialized variable
Diffstat (limited to 'drivers/spi/omap2_mcspi.c')
| -rw-r--r-- | drivers/spi/omap2_mcspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 6f86ba0175ac..969cdd2fe124 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -298,7 +298,7 @@ omap2_mcspi_txrx_dma(struct spi_device *spi, struct spi_transfer *xfer) | |||
| 298 | unsigned int count, c; | 298 | unsigned int count, c; |
| 299 | unsigned long base, tx_reg, rx_reg; | 299 | unsigned long base, tx_reg, rx_reg; |
| 300 | int word_len, data_type, element_count; | 300 | int word_len, data_type, element_count; |
| 301 | int elements; | 301 | int elements = 0; |
| 302 | u32 l; | 302 | u32 l; |
| 303 | u8 * rx; | 303 | u8 * rx; |
| 304 | const u8 * tx; | 304 | const u8 * tx; |