evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drivers: dma-removed: page align size on free"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-23 21:35:57 -08:00 • committed by Gerrit - the friendly Code Review server
commit d3462b2761
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/base/dma-removed.c
View file

@ -1,6 +1,6 @@
/* /*
* *
* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
* Copyright (C) 2000-2004 Russell King * Copyright (C) 2000-2004 Russell King
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -296,6 +296,7 @@ void removed_free(struct device *dev, size_t size, void *cpu_addr,
attrs); attrs);
struct removed_region *dma_mem = dev->removed_mem; struct removed_region *dma_mem = dev->removed_mem;
size = PAGE_ALIGN(size);
if (!no_kernel_mapping) if (!no_kernel_mapping)
iounmap(cpu_addr); iounmap(cpu_addr);
mutex_lock(&dma_mem->lock); mutex_lock(&dma_mem->lock);