diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-09 16:02:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-09 16:02:29 -0500 |
| commit | 43a6a1ec9055a53a11d6d735f11cceea13912bbe (patch) | |
| tree | a41a8a53c8e92be82d68a6b7862b50971ec2522a /arch/arm/include/asm/dma-mapping.h | |
| parent | 54707a942009fae083dd78b58ff057127ba0e900 (diff) | |
| parent | 4fb224638d608ba3bdc9200360663b4109038580 (diff) | |
Merge branch '2019-01-08-master-imports'
- stm32f7 GPIO fixes
- SATA env fixes
- More DM migration deadline warnings
- Regression fix for non-DM MMC drivers
- dma_alloc_coherent size fix on ARM.
Diffstat (limited to 'arch/arm/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 0883b7ea754..fc5b8f634d5 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -13,7 +13,7 @@ static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) { - *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len); + *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, ROUND(len, ARCH_DMA_MINALIGN)); return (void *)*handle; } |