From e28745a6fd6e6948b47caa099ea0833527e6ecb4 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 27 Aug 2012 12:40:42 +0800 Subject: [PATCH] --- yaml --- r: 332875 b: refs/heads/master c: 921eeadbbdd7ffba16937a3b63e408c980c39db6 h: refs/heads/master i: 332873: d3f576e6fab324ed12a86e3c519889ff8101a07e 332871: 4153d2a1ad22ea90ab107acffbc531785a57caef v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/dma_v2.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0a3a9834225b..53780dfeb17c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5557a419d44d063be665100086adf4721d41ea49 +refs/heads/master: 921eeadbbdd7ffba16937a3b63e408c980c39db6 diff --git a/trunk/drivers/dma/ioat/dma_v2.c b/trunk/drivers/dma/ioat/dma_v2.c index 86895760b598..b9d667851445 100644 --- a/trunk/drivers/dma/ioat/dma_v2.c +++ b/trunk/drivers/dma/ioat/dma_v2.c @@ -434,12 +434,11 @@ static struct ioat_ring_ent *ioat2_alloc_ring_ent(struct dma_chan *chan, gfp_t f return NULL; memset(hw, 0, sizeof(*hw)); - desc = kmem_cache_alloc(ioat2_cache, flags); + desc = kmem_cache_zalloc(ioat2_cache, flags); if (!desc) { pci_pool_free(dma->dma_pool, hw, phys); return NULL; } - memset(desc, 0, sizeof(*desc)); dma_async_tx_descriptor_init(&desc->txd, chan); desc->txd.tx_submit = ioat2_tx_submit_unlock;