From f300c7fb1d3cec2484710b185edb161674c93040 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Wed, 24 Oct 2012 14:09:14 +0900 Subject: [PATCH] --- yaml --- r: 334827 b: refs/heads/master c: 3dd7ea922051e68854e016cfd2992226cfb5bb43 h: refs/heads/master i: 334825: 0a7f73980972caa1e6f9c4a0a3c31eb300ae2e64 334823: be8927b756e00e86733a8d0804fa9ce04c886d11 v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/dma-mapping.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33162d9ac3a4..fc73f1ff7e15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 871ae57adc5ed092c1341f411514d0e8482e2611 +refs/heads/master: 3dd7ea922051e68854e016cfd2992226cfb5bb43 diff --git a/trunk/arch/arm/mm/dma-mapping.c b/trunk/arch/arm/mm/dma-mapping.c index 477a2d23ddf1..58bc3e4d3bd0 100644 --- a/trunk/arch/arm/mm/dma-mapping.c +++ b/trunk/arch/arm/mm/dma-mapping.c @@ -610,7 +610,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, pgprot_t prot, bool is_coherent, const void *caller) { u64 mask = get_coherent_dma_mask(dev); - struct page *page; + struct page *page = NULL; void *addr; #ifdef CONFIG_DMA_API_DEBUG