| Message ID | 1372316213-30671-1-git-send-email-ks.giri@samsung.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, Jun 27, 2013 at 4:45 PM, Mark Brown <broonie@kernel.org> wrote: > On Thu, Jun 27, 2013 at 12:26:53PM +0530, Girish K S wrote: >> After the patch "spi/s3c64xx: Fix non-dmaengine usage" >> with commit id 563b444e33810f3120838620c990480304e24e63 >> submitted by Mark Brown, the spi device detection in polling >> mode breaks. This revealed the missing check for polling during >> dma prepare. This patch adds the missing check. > > Applied with a fixed commit message - since the dmaengine stuff was > already in mainline at the time that polling mode was added the isse was > that the patch hadn't been tested with current mainline code. Hello Mark, This patch is missing in your pull request for 3.11. is it possible to add it? ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index d170cc0..ea82baa 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -434,6 +434,9 @@ static int s3c64xx_spi_prepare_transfer(struct spi_master *spi) dma_cap_mask_t mask; int ret; + if (is_polling(sdd)) + return 0; + dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask);
After the patch "spi/s3c64xx: Fix non-dmaengine usage" with commit id 563b444e33810f3120838620c990480304e24e63 submitted by Mark Brown, the spi device detection in polling mode breaks. This revealed the missing check for polling during dma prepare. This patch adds the missing check. Signed-off-by: Girish K S <ks.giri@samsung.com> --- drivers/spi/spi-s3c64xx.c | 3 +++ 1 file changed, 3 insertions(+)