Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 219ecde8 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: dma-removed: use memset_io for ioremap region" into msm-4.8

parents a5df9637 3025b451

drivers/base/dma-removed.c

+2 −2
Original line number Diff line number Diff line 
/*

 *

 *  Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 *  Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 *  Copyright (C) 2000-2004 Russell King

 *

 * This program is free software; you can redistribute it and/or modify
@@ -117,7 +117,7 @@ void *removed_alloc(struct device *dev, size_t size, dma_addr_t *handle, 
			bitmap_clear(dma_mem->bitmap, pageno, nbits);

		} else {

			if (!skip_zeroing)

				memset(addr, 0, size);

				memset_io(addr, 0, size);

			if (no_kernel_mapping) {

				iounmap(addr);

				addr = (void *)NO_KERNEL_MAPPING_DUMMY;