diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-11-17 23:06:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-18 02:40:32 +0100 |
commit | b6b24c73d56a166a829318a1f06803ff9b54857b (patch) | |
tree | a2bdfc3d4c3f0e9ef9cd6d127260752c67ccdc86 /drivers/spi/spi_stmp.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
download | linux-b6b24c73d56a166a829318a1f06803ff9b54857b.tar.xz linux-b6b24c73d56a166a829318a1f06803ff9b54857b.zip |
spi: error status should be negative
Return a negative error value instead of a positive
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Cc: dmitry pervushin <dpervushin@embeddedalley.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/spi_stmp.c')
-rw-r--r-- | drivers/spi/spi_stmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_stmp.c b/drivers/spi/spi_stmp.c index d871dc23909c..2552bb364005 100644 --- a/drivers/spi/spi_stmp.c +++ b/drivers/spi/spi_stmp.c @@ -242,7 +242,7 @@ static int stmp_spi_txrx_dma(struct stmp_spi *ss, int cs, wait_for_completion(&ss->done); if (!busy_wait(readl(ss->regs + HW_SSP_CTRL0) & BM_SSP_CTRL0_RUN)) - status = ETIMEDOUT; + status = -ETIMEDOUT; if (!dma_buf) dma_unmap_single(ss->master_dev, spi_buf_dma, len, dir); |