Merge "ASoC: msm: qdsp6v2: Avoid populating memory handle in error case"

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

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

			__func__,

			&cal_block->cal_data.paddr,

			cal_block->map_data.map_size);

		goto done;

	}

	cal_block->map_data.q6map_handle = atomic_read(&this_afe.

		mem_map_cal_handles[cal_index]);