From 3589a465d72f09ae16154316dd946ee48c3546e3 Mon Sep 17 00:00:00 2001 From: Ramprasad Katkam Date: Thu, 11 May 2017 14:29:25 +0530 Subject: [PATCH] ASOC: APR: Add separate notifier nodes for adsp/modem notifications APR registers for subsys_notification via audio_notifier for both adsp & modem services, with the same notifier node. This causes intermixing of the audio notifier lists of modem and adsp as the same apr notifier node is added to both adsp & modem list.Make separate notifier nodes for apr adsp & modem notifications to avoid this issue. Change-Id: I4a9146fbe340d02e8af0082d5342e5ac8009e0c4 Signed-off-by: Ramprasad Katkam --- drivers/soc/qcom/qdsp6v2/apr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/soc/qcom/qdsp6v2/apr.c b/drivers/soc/qcom/qdsp6v2/apr.c index a275537d4e08..5681b8f2e678 100644 --- a/drivers/soc/qcom/qdsp6v2/apr.c +++ b/drivers/soc/qcom/qdsp6v2/apr.c @@ -906,7 +906,12 @@ done: return NOTIFY_OK; } -static struct notifier_block service_nb = { +static struct notifier_block adsp_service_nb = { + .notifier_call = apr_notifier_service_cb, + .priority = 0, +}; + +static struct notifier_block modem_service_nb = { .notifier_call = apr_notifier_service_cb, .priority = 0, }; @@ -936,9 +941,9 @@ static int __init apr_init(void) is_initial_boot = true; subsys_notif_register("apr_adsp", AUDIO_NOTIFIER_ADSP_DOMAIN, - &service_nb); + &adsp_service_nb); subsys_notif_register("apr_modem", AUDIO_NOTIFIER_MODEM_DOMAIN, - &service_nb); + &modem_service_nb); return 0; }