diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /drivers/spi/spi_bitbang.c | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/spi/spi_bitbang.c')
| -rw-r--r-- | drivers/spi/spi_bitbang.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index f7f8580edad8..71e881419cdd 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c | |||
| @@ -344,12 +344,14 @@ static void bitbang_work(struct work_struct *work) | |||
| 344 | t->rx_dma = t->tx_dma = 0; | 344 | t->rx_dma = t->tx_dma = 0; |
| 345 | status = bitbang->txrx_bufs(spi, t); | 345 | status = bitbang->txrx_bufs(spi, t); |
| 346 | } | 346 | } |
| 347 | if (status > 0) | ||
| 348 | m->actual_length += status; | ||
| 347 | if (status != t->len) { | 349 | if (status != t->len) { |
| 348 | if (status > 0) | 350 | /* always report some kind of error */ |
| 349 | status = -EMSGSIZE; | 351 | if (status >= 0) |
| 352 | status = -EREMOTEIO; | ||
| 350 | break; | 353 | break; |
| 351 | } | 354 | } |
| 352 | m->actual_length += status; | ||
| 353 | status = 0; | 355 | status = 0; |
| 354 | 356 | ||
| 355 | /* protocol tweaks before next transfer */ | 357 | /* protocol tweaks before next transfer */ |