| Message ID | 1547694894-69589-1-git-send-email-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [-next] i2c: imx: Fix inconsistent IS_ERR and PTR_ERR in i2c_imx_dma_request() | expand |
Hi, thank you. On 17.01.19 04:14, YueHaibing wrote: > Change the call to PTR_ERR to access the value just tested by IS_ERR. > > Fixes: 5b3a23a3cc94 ("i2c: imx: notify about real errors on dma i2c_imx_dma_request") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > drivers/i2c/busses/i2c-imx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index 09b1245..42fed40 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -287,7 +287,7 @@ static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, > > dma->chan_tx = dma_request_chan(dev, "tx"); > if (IS_ERR(dma->chan_tx)) { > - ret = PTR_ERR(dma->chan_rx); > + ret = PTR_ERR(dma->chan_tx); > if (ret != -ENODEV && ret != -EPROBE_DEFER) > dev_err(dev, "can't request DMA tx channel (%d)\n", ret); > goto fail_al; > > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
On 2019-01-17 04:14, YueHaibing wrote: > Change the call to PTR_ERR to access the value just tested by IS_ERR. > > Fixes: 5b3a23a3cc94 ("i2c: imx: notify about real errors on dma i2c_imx_dma_request") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/i2c/busses/i2c-imx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > index 09b1245..42fed40 100644 > --- a/drivers/i2c/busses/i2c-imx.c > +++ b/drivers/i2c/busses/i2c-imx.c > @@ -287,7 +287,7 @@ static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, > > dma->chan_tx = dma_request_chan(dev, "tx"); > if (IS_ERR(dma->chan_tx)) { > - ret = PTR_ERR(dma->chan_rx); > + ret = PTR_ERR(dma->chan_tx); > if (ret != -ENODEV && ret != -EPROBE_DEFER) > dev_err(dev, "can't request DMA tx channel (%d)\n", ret); > goto fail_al; > > > You were beaten to it by Laurentiu Tudor, who sent the same patch [1] shortly before you. https://lore.kernel.org/patchwork/patch/1032511/ Cheers, Peter
On Thu, Jan 17, 2019 at 03:14:54AM +0000, YueHaibing wrote: > Change the call to PTR_ERR to access the value just tested by IS_ERR. > > Fixes: 5b3a23a3cc94 ("i2c: imx: notify about real errors on dma i2c_imx_dma_request") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied to for-next, thanks!
On Thu, Jan 17, 2019 at 11:03:20AM +0000, Peter Rosin wrote: > On 2019-01-17 04:14, YueHaibing wrote: > > Change the call to PTR_ERR to access the value just tested by IS_ERR. > > > > Fixes: 5b3a23a3cc94 ("i2c: imx: notify about real errors on dma i2c_imx_dma_request") > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > --- > > drivers/i2c/busses/i2c-imx.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c > > index 09b1245..42fed40 100644 > > --- a/drivers/i2c/busses/i2c-imx.c > > +++ b/drivers/i2c/busses/i2c-imx.c > > @@ -287,7 +287,7 @@ static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, > > > > dma->chan_tx = dma_request_chan(dev, "tx"); > > if (IS_ERR(dma->chan_tx)) { > > - ret = PTR_ERR(dma->chan_rx); > > + ret = PTR_ERR(dma->chan_tx); > > if (ret != -ENODEV && ret != -EPROBE_DEFER) > > dev_err(dev, "can't request DMA tx channel (%d)\n", ret); > > goto fail_al; > > > > > > > > You were beaten to it by Laurentiu Tudor, who sent the same patch [1] shortly > before you. Yes, but his Fixes: tag was wrong, so I applied this patch with Uwe's tag moved to here.
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 09b1245..42fed40 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -287,7 +287,7 @@ static int i2c_imx_dma_request(struct imx_i2c_struct *i2c_imx, dma->chan_tx = dma_request_chan(dev, "tx"); if (IS_ERR(dma->chan_tx)) { - ret = PTR_ERR(dma->chan_rx); + ret = PTR_ERR(dma->chan_tx); if (ret != -ENODEV && ret != -EPROBE_DEFER) dev_err(dev, "can't request DMA tx channel (%d)\n", ret); goto fail_al;
Change the call to PTR_ERR to access the value just tested by IS_ERR. Fixes: 5b3a23a3cc94 ("i2c: imx: notify about real errors on dma i2c_imx_dma_request") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/i2c/busses/i2c-imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)