From 721a94a5207c363a0b98ac8008f487d3d4f12bc5 Mon Sep 17 00:00:00 2001 From: Tomoya MORINAGA Date: Wed, 12 Oct 2011 09:38:35 +0900 Subject: [PATCH] --- yaml --- r: 273912 b: refs/heads/master c: 01631243d712d41681d61c0556341a3329860c47 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/pch_dma.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e2021f0eb73a..9c7d016ad214 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43f1508686e8e4746012bf87995085eeb0f5307 +refs/heads/master: 01631243d712d41681d61c0556341a3329860c47 diff --git a/trunk/drivers/dma/pch_dma.c b/trunk/drivers/dma/pch_dma.c index 6abe5ac3bd5e..a6d0e3dbed07 100644 --- a/trunk/drivers/dma/pch_dma.c +++ b/trunk/drivers/dma/pch_dma.c @@ -872,8 +872,7 @@ static int __devinit pch_dma_probe(struct pci_dev *pdev, int i; nr_channels = id->driver_data; - pd = kzalloc(sizeof(struct pch_dma)+ - sizeof(struct pch_dma_chan) * nr_channels, GFP_KERNEL); + pd = kzalloc(sizeof(*pd), GFP_KERNEL); if (!pd) return -ENOMEM;