diff options
| author | Vinod Koul <vkoul@kernel.org> | 2020-08-05 15:32:07 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-08-05 15:32:07 +0200 |
| commit | 0b5ad7b9522e6172342511fac6114fd8b7eb622a (patch) | |
| tree | b6a29560e6364bd98634564181cab54a3b6164a4 /drivers/dma/ti/k3-udma-private.c | |
| parent | dmaengine: ioat setting ioat timeout as module parameter (diff) | |
| parent | dmaengine: dw: Don't include unneeded header to platform data header (diff) | |
| download | linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.tar.xz linux-0b5ad7b9522e6172342511fac6114fd8b7eb622a.zip | |
Merge branch 'for-linus' into fixes
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Conflicts:
drivers/dma/idxd/sysfs.c
Diffstat (limited to 'drivers/dma/ti/k3-udma-private.c')
| -rw-r--r-- | drivers/dma/ti/k3-udma-private.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/dma/ti/k3-udma-private.c b/drivers/dma/ti/k3-udma-private.c index 77e8e67d995b..aa24e554f7b4 100644 --- a/drivers/dma/ti/k3-udma-private.c +++ b/drivers/dma/ti/k3-udma-private.c @@ -121,13 +121,17 @@ XUDMA_GET_RESOURCE_ID(rflow); #define XUDMA_RT_IO_FUNCTIONS(res) \ u32 xudma_##res##rt_read(struct udma_##res *p, int reg) \ { \ - return udma_##res##rt_read(p, reg); \ + if (!p) \ + return 0; \ + return udma_read(p->reg_rt, reg); \ } \ EXPORT_SYMBOL(xudma_##res##rt_read); \ \ void xudma_##res##rt_write(struct udma_##res *p, int reg, u32 val) \ { \ - udma_##res##rt_write(p, reg, val); \ + if (!p) \ + return; \ + udma_write(p->reg_rt, reg, val); \ } \ EXPORT_SYMBOL(xudma_##res##rt_write) XUDMA_RT_IO_FUNCTIONS(tchan); |