summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-11-24 07:16:30 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-11-24 07:16:30 +0100
commit1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch)
treeff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /drivers/spi
parentpowerpc: Fix build of some FSL platforms (diff)
parentMerge branch 'i2c-pnx-fixes' of git://git.fluff.org/bjdooks/linux (diff)
downloadlinux-1e43bee9c70654b4d52472c19e5f0a0cc18b6b36.tar.xz
linux-1e43bee9c70654b4d52472c19e5f0a0cc18b6b36.zip
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_stmp.c2
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);