* [PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()
@ 2016-06-13 14:27 weiyj_lk
2016-06-13 20:06 ` Boris Brezillon
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2016-06-13 14:27 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, David Woodhouse,
Brian Norris, Maxime Ripard, Chen-Yu Tsai
Cc: Wei Yongjun, linux-mtd, linux-arm-kernel, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
In case of error, the function dmaengine_prep_slave_sg() returns NULL
pointer not ERR_PTR(). The IS_ERR() test in the return value check
should be replaced with NULL test.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/mtd/nand/sunxi_nand.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index ef7f6df..653cb3a 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -390,8 +390,8 @@ static int sunxi_nfc_dma_op_prepare(struct mtd_info *mtd, const void *buf,
return -ENOMEM;
dmad = dmaengine_prep_slave_sg(nfc->dmac, sg, 1, tdir, DMA_CTRL_ACK);
- if (IS_ERR(dmad)) {
- ret = PTR_ERR(dmad);
+ if (!dmad) {
+ ret = -EINVAL;
goto err_unmap_buf;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()
2016-06-13 14:27 [PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare() weiyj_lk
@ 2016-06-13 20:06 ` Boris Brezillon
0 siblings, 0 replies; 2+ messages in thread
From: Boris Brezillon @ 2016-06-13 20:06 UTC (permalink / raw)
To: weiyj_lk
Cc: Richard Weinberger, David Woodhouse, Brian Norris, Maxime Ripard,
Chen-Yu Tsai, Wei Yongjun, linux-mtd, linux-arm-kernel,
linux-kernel
On Mon, 13 Jun 2016 14:27:18 +0000
weiyj_lk@163.com wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function dmaengine_prep_slave_sg() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Applied.
Thanks,
Boris
> ---
> drivers/mtd/nand/sunxi_nand.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index ef7f6df..653cb3a 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -390,8 +390,8 @@ static int sunxi_nfc_dma_op_prepare(struct mtd_info *mtd, const void *buf,
> return -ENOMEM;
>
> dmad = dmaengine_prep_slave_sg(nfc->dmac, sg, 1, tdir, DMA_CTRL_ACK);
> - if (IS_ERR(dmad)) {
> - ret = PTR_ERR(dmad);
> + if (!dmad) {
> + ret = -EINVAL;
> goto err_unmap_buf;
> }
>
>
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-13 20:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-13 14:27 [PATCH -next] mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare() weiyj_lk
2016-06-13 20:06 ` Boris Brezillon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).