Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1442329

[PATCH] dmaengine: zynqmp_dma: Fix static checker warning

Show all headers | View raw

This patch fixes the below static checker warning
drivers/dma/xilinx/zynqmp_dma.c:973 zynqmp_dma_chan_probe()
	warn: was && intended here instead of ||?

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
---
 drivers/dma/xilinx/zynqmp_dma.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c
index f777a5b..2248704 100644
--- a/drivers/dma/xilinx/zynqmp_dma.c
+++ b/drivers/dma/xilinx/zynqmp_dma.c
@@ -970,8 +970,13 @@ static int zynqmp_dma_chan_probe(struct zynqmp_dma_device *zdev,
 	chan->dst_burst_len = ZYNQMP_DMA_AWLEN_RST_VAL;
 	chan->src_burst_len = ZYNQMP_DMA_ARLEN_RST_VAL;
 	err = of_property_read_u32(node, "xlnx,bus-width", &chan->bus_width);
-	if ((err < 0) && ((chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_64) ||
-			  (chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_128))) {
+	if (err < 0) {
+		dev_err(&pdev->dev, "missing xlnx,bus-width property\n");
+		return err;
+	}
+
+	if ((chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_64) ||
+	    (chan->bus_width != ZYNQMP_DMA_BUS_WIDTH_128)) {
 		dev_err(zdev->dev, "invalid bus-width value");
 		return err;
 	}
-- 
1.7.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] dmaengine: zynqmp_dma: Fix static checker warning Kedareswara rao Appana <appana.durga.rao@xilinx.com> - 2016-07-13 12:50 +0200
  Re: [PATCH] dmaengine: zynqmp_dma: Fix static checker warning Dan Carpenter <dan.carpenter@oracle.com> - 2016-07-13 13:40 +0200
    RE: [PATCH] dmaengine: zynqmp_dma: Fix static checker warning Appana Durga Kedareswara Rao <appana.durga.rao@xilinx.com> - 2016-07-13 14:10 +0200

csiph-web