From 99cc65bd08af23f009a4635e3e7226bad1fabde3 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 14 Jun 2012 14:01:30 +0200 Subject: [PATCH] --- yaml --- r: 310941 b: refs/heads/master c: c080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae h: refs/heads/master i: 310939: b8f87fb867bb332ec639c87561dc37a19044af9e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/pci-dma.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bfcd35aeec2f..d908d20fc976 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb1117325ad719dc39e81209bc622d511db70e0 +refs/heads/master: c080e26edc3a2a3cdfa4c430c663ee1c3bbd8fae diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c index 62c9457ccd2f..c0f420f76cd3 100644 --- a/trunk/arch/x86/kernel/pci-dma.c +++ b/trunk/arch/x86/kernel/pci-dma.c @@ -100,7 +100,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, struct dma_attrs *attrs) { unsigned long dma_mask; - struct page *page = NULL; + struct page *page; unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; dma_addr_t addr; @@ -108,6 +108,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, flag |= __GFP_ZERO; again: + page = NULL; if (!(flag & GFP_ATOMIC)) page = dma_alloc_from_contiguous(dev, count, get_order(size)); if (!page)