diff options
| -rw-r--r-- | drivers/spi/spi-davinci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index 276a3884fb3c..514852cb7b3c 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c | |||
| @@ -167,8 +167,10 @@ static void davinci_spi_rx_buf_u16(u32 data, struct davinci_spi *dspi) | |||
| 167 | static u32 davinci_spi_tx_buf_u8(struct davinci_spi *dspi) | 167 | static u32 davinci_spi_tx_buf_u8(struct davinci_spi *dspi) |
| 168 | { | 168 | { |
| 169 | u32 data = 0; | 169 | u32 data = 0; |
| 170 | |||
| 170 | if (dspi->tx) { | 171 | if (dspi->tx) { |
| 171 | const u8 *tx = dspi->tx; | 172 | const u8 *tx = dspi->tx; |
| 173 | |||
| 172 | data = *tx++; | 174 | data = *tx++; |
| 173 | dspi->tx = tx; | 175 | dspi->tx = tx; |
| 174 | } | 176 | } |
| @@ -178,8 +180,10 @@ static u32 davinci_spi_tx_buf_u8(struct davinci_spi *dspi) | |||
| 178 | static u32 davinci_spi_tx_buf_u16(struct davinci_spi *dspi) | 180 | static u32 davinci_spi_tx_buf_u16(struct davinci_spi *dspi) |
| 179 | { | 181 | { |
| 180 | u32 data = 0; | 182 | u32 data = 0; |
| 183 | |||
| 181 | if (dspi->tx) { | 184 | if (dspi->tx) { |
| 182 | const u16 *tx = dspi->tx; | 185 | const u16 *tx = dspi->tx; |
| 186 | |||
| 183 | data = *tx++; | 187 | data = *tx++; |
| 184 | dspi->tx = tx; | 188 | dspi->tx = tx; |
| 185 | } | 189 | } |
| @@ -985,8 +989,8 @@ static int davinci_spi_probe(struct platform_device *pdev) | |||
| 985 | goto free_clk; | 989 | goto free_clk; |
| 986 | 990 | ||
| 987 | dev_info(&pdev->dev, "DMA: supported\n"); | 991 | dev_info(&pdev->dev, "DMA: supported\n"); |
| 988 | dev_info(&pdev->dev, "DMA: RX channel: %pa, TX channel: %pa, " | 992 | dev_info(&pdev->dev, "DMA: RX channel: %pa, TX channel: %pa, event queue: %d\n", |
| 989 | "event queue: %d\n", &dma_rx_chan, &dma_tx_chan, | 993 | &dma_rx_chan, &dma_tx_chan, |
| 990 | pdata->dma_event_q); | 994 | pdata->dma_event_q); |
| 991 | } | 995 | } |
| 992 | 996 | ||
