projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 95244f99 GKH |
1 | From foo@baz Wed Dec 6 17:39:55 CET 2017 |
| 2 | From: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com> | |
| 3 | Date: Thu, 2 Nov 2017 10:32:36 +0100 | |
| 4 | Subject: spi: sh-msiof: Fix DMA transfer size check | |
| 5 | ||
| 6 | From: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com> | |
| 7 | ||
| 8 | ||
| 9 | [ Upstream commit 36735783fdb599c94b9c86824583df367c65900b ] | |
| 10 | ||
| 11 | DMA supports 32-bit words only, | |
| 12 | even if BITLEN1 of SITMDR2 register is 16bit. | |
| 13 | ||
| 14 | Fixes: b0d0ce8b6b91 ("spi: sh-msiof: Add DMA support") | |
| 15 | Signed-off-by: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com> | |
| 16 | Signed-off-by: Simon Horman <horms+renesas@verge.net.au> | |
| 17 | Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> | |
| 18 | Acked-by: Dirk Behme <dirk.behme@de.bosch.com> | |
| 19 | Signed-off-by: Mark Brown <broonie@kernel.org> | |
| 20 | Signed-off-by: Sasha Levin <alexander.levin@verizon.com> | |
| 21 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 22 | --- | |
| 23 | drivers/spi/spi-sh-msiof.c | 2 +- | |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 25 | ||
| 26 | --- a/drivers/spi/spi-sh-msiof.c | |
| 27 | +++ b/drivers/spi/spi-sh-msiof.c | |
| 28 | @@ -862,7 +862,7 @@ static int sh_msiof_transfer_one(struct | |
| 29 | break; | |
| 30 | copy32 = copy_bswap32; | |
| 31 | } else if (bits <= 16) { | |
| 32 | - if (l & 1) | |
| 33 | + if (l & 3) | |
| 34 | break; | |
| 35 | copy32 = copy_wswap32; | |
| 36 | } else { |