diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/spi/dw_spi.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/spi/dw_spi.c')
| -rw-r--r-- | drivers/spi/dw_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index 9a6196461b2..b1a4b9f503a 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c | |||
| @@ -345,7 +345,7 @@ static void int_error_stop(struct dw_spi *dws, const char *msg) | |||
| 345 | 345 | ||
| 346 | void dw_spi_xfer_done(struct dw_spi *dws) | 346 | void dw_spi_xfer_done(struct dw_spi *dws) |
| 347 | { | 347 | { |
| 348 | /* Update total byte transfered return count actual bytes read */ | 348 | /* Update total byte transferred return count actual bytes read */ |
| 349 | dws->cur_msg->actual_length += dws->len; | 349 | dws->cur_msg->actual_length += dws->len; |
| 350 | 350 | ||
| 351 | /* Move to next transfer */ | 351 | /* Move to next transfer */ |