diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 15:15:10 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-02-21 15:15:10 +0300 |
| commit | d0055df0c9c1471c389197a69f43e300185a75aa (patch) | |
| tree | 7a1c253162f9ea99bf544fac4ae9219c398cae3f /arch/powerpc/platforms/powernv/npu-dma.c | |
| parent | 637cfeb9f99ca097747139a5419bc23e0b885655 (diff) | |
| parent | 4a605e2d1a69f5aea06da10d81e22802a90812a3 (diff) | |
| download | linux-d0055df0c9c1471c389197a69f43e300185a75aa.tar.xz | |
Merge branch 'topic/dma' into next
Merge hch's big DMA rework series. This is in a topic branch in case he
wants to merge it to minimise conflicts.
Diffstat (limited to 'arch/powerpc/platforms/powernv/npu-dma.c')
| -rw-r--r-- | arch/powerpc/platforms/powernv/npu-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powernv/npu-dma.c b/arch/powerpc/platforms/powernv/npu-dma.c index bc06088d46bd..ccf186bb60ec 100644 --- a/arch/powerpc/platforms/powernv/npu-dma.c +++ b/arch/powerpc/platforms/powernv/npu-dma.c @@ -216,7 +216,7 @@ static void pnv_npu_dma_set_32(struct pnv_ioda_pe *npe) * their parent device so drivers shouldn't be doing DMA * operations directly on these devices. */ - set_dma_ops(&npe->pdev->dev, NULL); + set_dma_ops(&npe->pdev->dev, &dma_dummy_ops); } /* |