diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-08 16:50:04 -0700 |
|---|---|---|
| committer | Scott Williams <scwilliams@nvidia.com> | 2011-09-08 17:00:24 -0700 |
| commit | fc748217b881baaa9faa86de357822ecd117602f (patch) | |
| tree | cafc11943eb2d13a7bb6e4613e79ef0cd84eb6d5 /drivers | |
| parent | 77036bafa592f2d87fb6e4ccd61bdca5d11de69a (diff) | |
| parent | 977c3cd523b71a6f1c73c21a10483001de890eb0 (diff) | |
Merge remote branch 'origin/linux-tegra-nv-2.6.39' into android-tegra-nv-2.6.39
Change-Id: I45d9415be645ec68c809a19a48628341f7675b4e
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c index fe6edda5d2a4..a775f3589ca1 100644 --- a/drivers/i2c/busses/i2c-tegra.c +++ b/drivers/i2c/busses/i2c-tegra.c @@ -327,12 +327,12 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) if (words_to_transfer > tx_fifo_avail) words_to_transfer = tx_fifo_avail; + i2c_writesl(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer); buf += words_to_transfer * BYTES_PER_FIFO_WORD; buf_remaining -= words_to_transfer * BYTES_PER_FIFO_WORD; tx_fifo_avail -= words_to_transfer; i2c_dev->msg_buf_remaining = buf_remaining; i2c_dev->msg_buf = buf; - i2c_writesl(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer); /* * If there is a partial word at the end of buf, handle it manually to |