Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit caf5ee94 authored by Kedareswara rao Appana's avatar Kedareswara rao Appana Committed by Vinod Koul
Browse files

dmaengine: zynqmp_dma: Fix static checker warning 



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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarKedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent ad52465b

drivers/dma/xilinx/zynqmp_dma.c

+8 −3
Original line number Diff line number Diff line
@@ -970,12 +970,17 @@ 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))) {

		dev_err(zdev->dev, "invalid bus-width value");

	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 -EINVAL;

	}



	chan->is_dmacoherent =  of_property_read_bool(node, "dma-coherent");

	zdev->chan = chan;

	tasklet_init(&chan->tasklet, zynqmp_dma_do_tasklet, (ulong)chan);