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

Commit d211a9d5 authored by Kunlei Zhang's avatar Kunlei Zhang
Browse files

dsp: avoid start voice happens before unmap cal memory 

When unmap voice cal memory, start voice happens before
unmap memory. It causes voice module still tries to access
unmapped memory during the process.

Fix it by remove start voice before unmap cal memory.

Change-Id: I0e3205efd9bc6e7b1619d86899570bf5ec31eaef
parent 111a7ea8

dsp/q6voice.c

+1 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */

#include <linux/slab.h>

#include <linux/kthread.h>
@@ -3958,14 +3958,6 @@ static int voice_unmap_cal_memory(int32_t cal_type, 
			else

				pr_err("%s: Invalid cal type %d!\n",

					__func__, cal_type);



			result2 = voice_send_start_voice_cmd(v);

			if (result2) {

				pr_err("%s: Voice_send_start_voice_cmd failed for session 0x%x, err %d!\n",

					__func__, v->session_id, result2);



				result = result2;

			}

		}



		if ((cal_block->map_data.q6map_handle != 0) &&