xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/master' into next

Browse Source
This commit is contained in:
Benjamin Herrenschmidt
2009-11-24 17:16:30 +11:00
parent 7d6709a208 a8a8a669ea
commit 1e43bee9c7
237 changed files with 2255 additions and 1580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi_stmp.c
View File

@@ -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);