Move initialization of msg->status up over the call to dev_err, in both calls to ep93xx_spi_dma_prepare, and change the reference in the call to dev_err to msg->status, to both fix the wrong argument to PTR_ERR in the second case and to make the dev_err line a little shorter. This required furthermore replacing %ld by %d, since msg->status is an integer.
The semantic match that finds the PTR_ERR problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,y; @@ if (IS_ERR(x) || ...) { ... when any when != IS_ERR(...) ( PTR_ERR(x) | * PTR_ERR(y) ) ... when any } // </smpl> Reorganizations at the suggestion of Walter Harms. Signed-off-by: Julia Lawall <julia.law...@lip6.fr> --- v2: Reorganize the code, to solve the problem in a way that makes the resulting code simpler. drivers/spi/spi-ep93xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index bb00be8..73d0df6 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -559,16 +559,16 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) rxd = ep93xx_spi_dma_prepare(espi, DMA_DEV_TO_MEM); if (IS_ERR(rxd)) { - dev_err(&espi->pdev->dev, "DMA RX failed: %ld\n", PTR_ERR(rxd)); msg->status = PTR_ERR(rxd); + dev_err(&espi->pdev->dev, "DMA RX failed: %d\n", msg->status); return; } txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV); if (IS_ERR(txd)) { ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); - dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd)); msg->status = PTR_ERR(txd); + dev_err(&espi->pdev->dev, "DMA TX failed: %d\n", msg->status); return; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
