From: Vineet Gupta <vgupta@synopsys.com>
Date: Fri, 3 Jul 2015 05:10:43 +0000 (+0530)
Subject: ARC: Don't memzero twice in dma_alloc_coherent for __GFP_ZERO
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f718c2efff0b0460e5335607a1c6caf620847680;p=linux-beck.git

ARC: Don't memzero twice in dma_alloc_coherent for __GFP_ZERO

alloc_pages_exact() get gfp flags and handle zero'ing already

And while it, fix the case where ioremap fails: return rightaway.

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
---

diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index 74a637a1cfc4..57706a9c6948 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -60,8 +60,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size,
 
 	/* This is kernel Virtual address (0x7000_0000 based) */
 	kvaddr = ioremap_nocache((unsigned long)paddr, size);
-	if (kvaddr != NULL)
-		memset(kvaddr, 0, size);
+	if (kvaddr == NULL)
+		return NULL;
 
 	/* This is bus address, platform dependent */
 	*dma_handle = (dma_addr_t)paddr;