From d3e7639ae8ba042e47a7dfd5599f897865ee1385 Mon Sep 17 00:00:00 2001 From: Minskey Guo Date: Sun, 2 May 2010 12:52:35 -0700 Subject: [PATCH] --- yaml --- r: 197532 b: refs/heads/master c: c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/ioat/pci.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c9a3af73cd5c..500c75acee86 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2adfc550b6d9646301c810643bc309fa49375987 +refs/heads/master: c86e1401c9f2ba8d989fa1c4b33d0f0ec3ba8aaf diff --git a/trunk/drivers/dma/ioat/pci.c b/trunk/drivers/dma/ioat/pci.c index 99ec26725bae..fab37d1cf48d 100644 --- a/trunk/drivers/dma/ioat/pci.c +++ b/trunk/drivers/dma/ioat/pci.c @@ -138,15 +138,10 @@ static int __devinit ioat_pci_probe(struct pci_dev *pdev, const struct pci_devic if (err) return err; - device = devm_kzalloc(dev, sizeof(*device), GFP_KERNEL); - if (!device) - return -ENOMEM; - - pci_set_master(pdev); - device = alloc_ioatdma(pdev, iomap[IOAT_MMIO_BAR]); if (!device) return -ENOMEM; + pci_set_master(pdev); pci_set_drvdata(pdev, device); device->version = readb(device->reg_base + IOAT_VER_OFFSET);