diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-05-11 19:08:10 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2018-05-11 19:08:10 +0300 |
| commit | 94cc2fde365fb4484080ea6675bb1e0c933f8002 (patch) | |
| tree | a249c6f6b12ff2dbe39d78bfb050e9c28619bee9 /drivers/mailbox/bcm-flexrm-mailbox.c | |
| parent | 900aa8ad21587e909603f471b6cd81fd5338ec45 (diff) | |
| parent | 8eb008c80841e3410ef2c043093478ea36bb5ff1 (diff) | |
| download | linux-94cc2fde365fb4484080ea6675bb1e0c933f8002.tar.xz | |
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
drm-misc-next is still based on v4.16-rc7, and was getting a bit stale.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/mailbox/bcm-flexrm-mailbox.c')
| -rw-r--r-- | drivers/mailbox/bcm-flexrm-mailbox.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c index a8cf4333a68f..8ab077ff58f4 100644 --- a/drivers/mailbox/bcm-flexrm-mailbox.c +++ b/drivers/mailbox/bcm-flexrm-mailbox.c @@ -1268,7 +1268,7 @@ static int flexrm_startup(struct mbox_chan *chan) } /* Allocate completion memory */ - ring->cmpl_base = dma_pool_alloc(ring->mbox->cmpl_pool, + ring->cmpl_base = dma_pool_zalloc(ring->mbox->cmpl_pool, GFP_KERNEL, &ring->cmpl_dma_base); if (!ring->cmpl_base) { dev_err(ring->mbox->dev, @@ -1277,7 +1277,6 @@ static int flexrm_startup(struct mbox_chan *chan) ret = -ENOMEM; goto fail_free_bd_memory; } - memset(ring->cmpl_base, 0, RING_CMPL_SIZE); /* Request IRQ */ if (ring->irq == UINT_MAX) { |