diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 16:37:13 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 16:37:13 +0300 |
| commit | 3bda03865fcaf5e30248bf4b7b37a81f6966caf9 (patch) | |
| tree | 40e1edb696326bfbd028afc271e7272d87b6b506 /drivers/dma/sh/rcar-dmac.c | |
| parent | 7f4b5cde24094127ace370c3c6b82fef65d9f71f (diff) | |
| parent | 2a173ec993baa6a97e7b0fb89240200a88d90746 (diff) | |
| download | linux-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.tar.xz | |
Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix for 5.7 and maintainer update
- Silence false positive lockdep warning
- add Claudio as reviewer
Diffstat (limited to 'drivers/dma/sh/rcar-dmac.c')
| -rw-r--r-- | drivers/dma/sh/rcar-dmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index f06016d38a05..59b36ab5d684 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1219,7 +1219,7 @@ rcar_dmac_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, sg_len = buf_len / period_len; if (sg_len > RCAR_DMAC_MAX_SG_LEN) { dev_err(chan->device->dev, - "chan%u: sg length %d exceds limit %d", + "chan%u: sg length %d exceeds limit %d", rchan->index, sg_len, RCAR_DMAC_MAX_SG_LEN); return NULL; } |