UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
This commit is contained in:
Kedareswara rao Appana 2016-07-14 19:00:55 +05:30 committed by Vinod Koul
parent ad52465b6c
commit caf5ee94be
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/dma/xilinx/zynqmp_dma.c
View File

@ -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);