diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2015-07-03 07:10:43 +0200 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-07-06 07:39:01 +0200 |
| commit | f718c2efff0b0460e5335607a1c6caf620847680 (patch) | |
| tree | e32b70ab3aced772db554ab870c6ba64fda33650 /arch/arc/mm | |
| parent | ARC: Override toplevel default -O2 with -O3 (diff) | |
| download | linux-f718c2efff0b0460e5335607a1c6caf620847680.tar.xz linux-f718c2efff0b0460e5335607a1c6caf620847680.zip | |
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>
Diffstat (limited to 'arch/arc/mm')
| -rw-r--r-- | arch/arc/mm/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |